LU-8465 e2fsck: merge icounts after thread finishes

[tools/e2fsprogs.git] / e2fsck / iscan.c

diff --git a/e2fsck/iscan.c b/e2fsck/iscan.c
index 7e1bbd3..52cad11 100644 (file)
--- a/e2fsck/iscan.c
+++ b/e2fsck/iscan.c
@@ -3,6 +3,7 @@
  * anything else)
  */
 
+#include "config.h"
 #include <string.h>
 #include <fcntl.h>
 #include <ctype.h>
@@ -15,9 +16,6 @@
 #ifdef HAVE_ERRNO_H
 #include <errno.h>
 #endif
-#ifdef HAVE_MNTENT_H
-#include <mntent.h>
-#endif
 #include <sys/ioctl.h>
 #ifdef HAVE_MALLOC_H
 #include <malloc.h>
@@ -51,7 +49,7 @@ static void usage(void)
 static void PRS(int argc, char *argv[])
 {
        int             flush = 0;
-       char            c;
+       int             c;
 #ifdef MTRACE
        extern void     *mallwatch;
 #endif
@@ -60,7 +58,7 @@ static void PRS(int argc, char *argv[])
        setbuf(stdout, NULL);
        setbuf(stderr, NULL);
        initialize_ext2_error_table();
-       
+
        if (argc && *argv)
                program_name = *argv;
        while ((c = getopt (argc, argv, "FI")) != EOF)
@@ -91,7 +89,7 @@ static void PRS(int argc, char *argv[])
                close(fd);
        }
 }
-                                       
+
 int main (int argc, char *argv[])
 {
        errcode_t       retval = 0;
@@ -101,7 +99,7 @@ int main (int argc, char *argv[])
        __u32   num_inodes = 0;
        struct ext2_inode inode;
        ext2_inode_scan scan;
-       
+
        init_resource_track(&global_rtrack);
 
        PRS(argc, argv);
@@ -109,13 +107,13 @@ int main (int argc, char *argv[])
        retval = ext2fs_open(device_name, 0,
                             0, 0, unix_io_manager, &fs);
        if (retval) {
-               com_err(program_name, retval, _("while trying to open %s"),
+               com_err(program_name, retval, _("while trying to open '%s'"),
                        device_name);
                exit(1);
        }
 
        ehandler_init(fs->io);
-       
+
        retval = ext2fs_open_inode_scan(fs, inode_buffer_blocks, &scan);
        if (retval) {
                com_err(program_name, retval, _("while opening inode scan"));
@@ -133,9 +131,9 @@ int main (int argc, char *argv[])
                        break;
                num_inodes++;
        }
-       
+
        print_resource_track(NULL, &global_rtrack);
        printf(_("%u inodes scanned.\n"), num_inodes);
-       
+
        exit(0);
 }