From: Denis Vlasenko <vda.linux@googlemail.com>
Date: Fri, 28 Sep 2007 22:13:55 +0000 (-0000)
Subject: more "if (p) free(p)" fixes; fix a typo in comment
X-Git-Tag: 1_8_0~121
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=ab8c9378c93168fcf3f3d7b87089cdc7884880cd;p=oweals%2Fbusybox.git

more "if (p) free(p)" fixes; fix a typo in comment
---

diff --git a/libbb/getopt32.c b/libbb/getopt32.c
index 318f08059..2452eb0a5 100644
--- a/libbb/getopt32.c
+++ b/libbb/getopt32.c
@@ -30,7 +30,7 @@ getopt32(char **argv, const char *applet_opts, ...)
 
         "r" will add 1    (bit 0)
         "n" will add 2    (bit 1)
-        "u  will add 4    (bit 2)
+        "u" will add 4    (bit 2)
         "g" will add 8    (bit 3)
 
         and so on.  You can also look at the return value as a bit
diff --git a/libbb/procps.c b/libbb/procps.c
index 3a31eeff3..f1c0b6d27 100644
--- a/libbb/procps.c
+++ b/libbb/procps.c
@@ -353,14 +353,10 @@ procps_status_t *procps_scan(procps_status_t* sp, int flags)
 
 #if 0 /* PSSCAN_CMD is not used */
 		if (flags & (PSSCAN_CMD|PSSCAN_ARGV0)) {
-			if (sp->argv0) {
-				free(sp->argv0);
-				sp->argv0 = NULL;
-			}
-			if (sp->cmd) {
-				free(sp->cmd);
-				sp->cmd = NULL;
-			}
+			free(sp->argv0);
+			sp->argv0 = NULL;
+			free(sp->cmd);
+			sp->cmd = NULL;
 			strcpy(filename_tail, "/cmdline");
 			/* TODO: to get rid of size limits, read into malloc buf,
 			 * then realloc it down to real size. */
@@ -380,10 +376,8 @@ procps_status_t *procps_scan(procps_status_t* sp, int flags)
 		}
 #else
 		if (flags & PSSCAN_ARGV0) {
-			if (sp->argv0) {
-				free(sp->argv0);
-				sp->argv0 = NULL;
-			}
+			free(sp->argv0);
+			sp->argv0 = NULL;
 			strcpy(filename_tail, "/cmdline");
 			n = read_to_buf(filename, buf);
 			if (n <= 0)