A nice patch from Larry Doolittle that adds -Wshadow and

cleans up most of the now-revealed problems.


git-svn-id: svn://busybox.net/trunk/busybox@2177 69ca8d6d-28ef-0310-b511-8ec308f3f277

4 files changed, 30 insertions, 28 deletions

diff --git a/util-linux/fsck_minix.c b/util-linux/fsck_minix.c
index bd0c8a61c..a2421fc34 100644
--- a/util-linux/fsck_minix.c
+++ b/util-linux/fsck_minix.c
@@ -1439,18 +1439,18 @@ extern int fsck_minix_main(int argc, char **argv)
                 check();
         }
         if (verbose) {
-                int i, free;
+                int i, free_cnt;
 
-                for (i = 1, free = 0; i <= INODES; i++)
+                for (i = 1, free_cnt = 0; i <= INODES; i++)
                         if (!inode_in_use(i))
-                                free++;
-                printf("\n%6ld inodes used (%ld%%)\n", (INODES - free),
-                           100 * (INODES - free) / INODES);
-                for (i = FIRSTZONE, free = 0; i < ZONES; i++)
+                                free_cnt++;
+                printf("\n%6ld inodes used (%ld%%)\n", (INODES - free_cnt),
+                           100 * (INODES - free_cnt) / INODES);
+                for (i = FIRSTZONE, free_cnt = 0; i < ZONES; i++)
                         if (!zone_in_use(i))
-                                free++;
-                printf("%6ld zones used (%ld%%)\n", (ZONES - free),
-                           100 * (ZONES - free) / ZONES);
+                                free_cnt++;
+                printf("%6ld zones used (%ld%%)\n", (ZONES - free_cnt),
+                           100 * (ZONES - free_cnt) / ZONES);
                 printf("\n%6d regular files\n"
                            "%6d directories\n"
                            "%6d character device files\n"
diff --git a/util-linux/nfsmount.c b/util-linux/nfsmount.c
index cd815102c..6643ed5aa 100644
--- a/util-linux/nfsmount.c
+++ b/util-linux/nfsmount.c
@@ -157,7 +157,7 @@ static const int NFS_MOUNT_NONLM = 0x0200;	/* 3 */
 #define HAVE_personality
 #define HAVE_tm_gmtoff
 
-static char *nfs_strerror(int stat);
+static char *nfs_strerror(int status);
 
 #define MAKE_VERSION(p,q,r)     (65536*(p) + 256*(q) + (r))
 #define MAX_NFSPROT ((nfs_mount_version >= 4) ? 3 : 2)
@@ -873,16 +873,16 @@ static struct {
         { -1,                   EIO             }
 };
 
-static char *nfs_strerror(int stat)
+static char *nfs_strerror(int status)
 {
         int i;
         static char buf[256];
 
         for (i = 0; nfs_errtbl[i].stat != -1; i++) {
-                if (nfs_errtbl[i].stat == stat)
+                if (nfs_errtbl[i].stat == status)
                         return strerror(nfs_errtbl[i].errnum);
         }
-        sprintf(buf, _("unknown nfs status return value: %d"), stat);
+        sprintf(buf, _("unknown nfs status return value: %d"), status);
         return buf;
 }
 
diff --git a/util-linux/rdate.c b/util-linux/rdate.c
index 5f31282fc..ead1e7c7d 100644
--- a/util-linux/rdate.c
+++ b/util-linux/rdate.c
@@ -40,7 +40,7 @@ static const int RFC_868_BIAS = 2208988800UL;
 static time_t askremotedate(const char *host)
 {
         struct hostent *h;
-        struct sockaddr_in sin;
+        struct sockaddr_in s_in;
         struct servent *tserv;
         unsigned long int nett, localt;
         int fd;
@@ -54,11 +54,11 @@ static time_t askremotedate(const char *host)
         if ((fd = socket(AF_INET, SOCK_STREAM, 0)) < 0)    /* get net connection */
                 perror_msg_and_die("%s", "socket");
 
-        memcpy(&sin.sin_addr, h->h_addr, sizeof(sin.sin_addr));
-        sin.sin_port= tserv->s_port;
-        sin.sin_family = AF_INET;
+        memcpy(&s_in.sin_addr, h->h_addr, sizeof(s_in.sin_addr));
+        s_in.sin_port= tserv->s_port;
+        s_in.sin_family = AF_INET;
 
-        if (connect(fd, (struct sockaddr *)&sin, sizeof(sin)) < 0)      /* connect to time server */
+        if (connect(fd, (struct sockaddr *)&s_in, sizeof(s_in)) < 0)      /* connect to time server */
                 perror_msg_and_die("%s", host);
 
         if (read(fd, (void *)&nett, 4) != 4)    /* read time from server */
@@ -79,7 +79,7 @@ static time_t askremotedate(const char *host)
 
 int rdate_main(int argc, char **argv)
 {
-        time_t time;
+        time_t remote_time;
         int opt;
         int setdate = 0;
         int printdate= 0;
@@ -111,15 +111,15 @@ int rdate_main(int argc, char **argv)
         if (optind == argc)
                 show_usage();
 
-        time = askremotedate(argv[optind]);
+        remote_time = askremotedate(argv[optind]);
 
         if (setdate) {
-                if (stime(&time) < 0)
+                if (stime(&remote_time) < 0)
                         perror_msg_and_die("Could not set time of day");
         }
 
         if (printdate)
-                printf("%s", ctime(&time));
+                printf("%s", ctime(&remote_time));
 
         return EXIT_SUCCESS;
 }
diff --git a/util-linux/umount.c b/util-linux/umount.c
index 2868a1bc3..cc7d38d7c 100644
--- a/util-linux/umount.c
+++ b/util-linux/umount.c
@@ -57,7 +57,9 @@ static int doForce = FALSE;
 #if defined BB_FEATURE_MOUNT_LOOP
 static int freeLoop = TRUE;
 #endif
+#if defined BB_MTAB
 static int useMtab = TRUE;
+#endif
 static int umountAll = FALSE;
 static int doRemount = FALSE;
 extern const char mtab_file[];  /* Defined in utility.c */
@@ -162,7 +164,7 @@ void mtab_free(void)
 }
 #endif
 
-static int do_umount(const char *name, int useMtab)
+static int do_umount(const char *name)
 {
         int status;
         char *blockDevice = mtab_getinfo(name, MTAB_GETDEVICE);
@@ -204,7 +206,7 @@ static int do_umount(const char *name, int useMtab)
         return (FALSE);
 }
 
-static int umount_all(int useMtab)
+static int umount_all(void)
 {
         int status = TRUE;
         char *mountpt;
@@ -214,14 +216,14 @@ static int umount_all(int useMtab)
                 /* Never umount /proc on a umount -a */
                 if (strstr(mountpt, "proc")!= NULL)
                         continue;
-                if (!do_umount(mountpt, useMtab)) {
+                if (!do_umount(mountpt)) {
                         /* Don't bother retrying the umount on busy devices */
                         if (errno == EBUSY) {
                                 perror_msg("%s", mountpt);
                                 status = FALSE;
                                 continue;
                         }
-                        if (!do_umount(mountpt, useMtab)) {
+                        if (!do_umount(mountpt)) {
                                 printf("Couldn't umount %s on %s: %s\n",
                                            mountpt, mtab_getinfo(mountpt, MTAB_GETDEVICE),
                                            strerror(errno));
@@ -275,12 +277,12 @@ extern int umount_main(int argc, char **argv)
 
         mtab_read();
         if (umountAll == TRUE) {
-                if (umount_all(useMtab) == TRUE)
+                if (umount_all() == TRUE)
                         return EXIT_SUCCESS;
                 else
                         return EXIT_FAILURE;
         }
-        if (do_umount(*argv, useMtab) == TRUE)
+        if (do_umount(*argv) == TRUE)
                 return EXIT_SUCCESS;
         perror_msg_and_die("%s", *argv);
 }