===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/bgplg/bgplgsh.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- src/usr.bin/bgplg/bgplgsh.c	2015/01/16 06:40:06	1.7
+++ src/usr.bin/bgplg/bgplgsh.c	2015/12/09 17:52:24	1.8
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bgplgsh.c,v 1.7 2015/01/16 06:40:06 deraadt Exp $	*/
+/*	$OpenBSD: bgplgsh.c,v 1.8 2015/12/09 17:52:24 mmcc Exp $	*/
 
 /*
  * Copyright (c) 2005, 2006 Reyk Floeter <reyk@openbsd.org>
@@ -151,8 +151,7 @@
 
 	new_argv[c] = NULL;
 
-	if (argv != NULL)
-		free(argv);
+	free(argv);
 
 	return (new_argv);
 }
@@ -185,10 +184,8 @@
 	ret = 0;
 
  done:
-	if (cmdp != NULL)
-		free(cmdp);
-	if (cmdstr != NULL)
-		free(cmdstr);
+	free(cmdp);
+	free(cmdstr);
 	return (ret);
 }
 
@@ -268,14 +265,10 @@
 		}
 
  next:
-		if (argp != NULL) {
-			free(argp);
-			argp = NULL;
-		}
-		if (line != NULL) {
-			free(line);
-			line = NULL;
-		}
+		free(argp);
+		argp = NULL;
+		free(line);
+		line = NULL;
 		cmd = NULL;
 	}