Another update from Larry:

[oweals/busybox.git] / fsck_minix.c

diff --git a/fsck_minix.c b/fsck_minix.c
index 18841ec563b6c9fa14fb2f2b58c1decbad8eff0e..a2421fc346a283b5d6787b32830731ff8dc8dd17 100644 (file)
--- a/fsck_minix.c
+++ b/fsck_minix.c
@@ -86,7 +86,6 @@
  * enforced (but it's not much fun on a character device :-). 
  */
 
-#include "busybox.h"
 #include <stdio.h>
 #include <errno.h>
 #include <unistd.h>
@@ -97,6 +96,7 @@
 #include <termios.h>
 #include <mntent.h>
 #include <sys/param.h>
+#include "busybox.h"
 
  
  typedef unsigned char u8;
@@ -283,14 +283,9 @@ static void leave(int status)
        exit(status);
 }
 
-static void show_usage(void)
-{
-       usage(fsck_minix_usage);
-}
-
 static void die(const char *str)
 {
-       error_msg("%s\n", str);
+       error_msg("%s", str);
        leave(8);
 }
 
@@ -706,7 +701,7 @@ static void read_tables(void)
        }
 }
 
-struct minix_inode *get_inode(unsigned int nr)
+static struct minix_inode *get_inode(unsigned int nr)
 {
        struct minix_inode *inode;
 
@@ -754,7 +749,7 @@ struct minix_inode *get_inode(unsigned int nr)
 }
 
 #ifdef BB_FEATURE_MINIX2
-struct minix2_inode *get_inode2(unsigned int nr)
+static struct minix2_inode *get_inode2(unsigned int nr)
 {
        struct minix2_inode *inode;
 
@@ -1444,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"