Merge branch 'maint' into next

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

diff --git a/e2fsck/scantest.c b/e2fsck/scantest.c
index 1a37dc4..ed3595f 100644 (file)
--- a/e2fsck/scantest.c
+++ b/e2fsck/scantest.c
@@ -2,6 +2,7 @@
  * scantest.c - test the speed of the inode scan routine
  */
 
+#include "config.h"
 #include <string.h>
 #include <fcntl.h>
 #include <ctype.h>
@@ -11,11 +12,10 @@
 #include <getopt.h>
 #endif
 #include <unistd.h>
-#ifdef HAVE_MNTENT_H
-#include <mntent.h>
-#endif
 #include <sys/ioctl.h>
+#ifdef HAVE_MALLOC_H
 #include <malloc.h>
+#endif
 #include <sys/resource.h>
 
 #include "et/com_err.h"
@@ -29,8 +29,7 @@
 #include <sys/types.h>
 #include <sys/time.h>
 
-#include <linux/ext2_fs.h>
-
+#include "ext2fs/ext2_fs.h"
 #include "ext2fs/ext2fs.h"
 
 
@@ -54,7 +53,7 @@ struct resource_track global_rtrack;
 void init_resource_track(struct resource_track *track)
 {
        struct rusage r;
-       
+
        track->brk_start = sbrk(0);
        gettimeofday(&track->time_start, 0);
        getrusage(RUSAGE_SELF, &r);
@@ -77,8 +76,8 @@ static void print_resource_track(struct resource_track *track)
        gettimeofday(&time_end, 0);
        getrusage(RUSAGE_SELF, &r);
 
-       printf("Memory used: %d, elapsed time: %6.3f/%6.3f/%6.3f\n",
-              (int) (((char *) sbrk(0)) - ((char *) track->brk_start)),
+       printf(_("Memory used: %lu, elapsed time: %6.3f/%6.3f/%6.3f\n"),
+              (unsigned long)((char *)sbrk(0) - (char *)track->brk_start),
               timeval_subtract(&time_end, &track->time_start),
               timeval_subtract(&r.ru_utime, &track->user_start),
               timeval_subtract(&r.ru_stime, &track->system_start));
@@ -93,31 +92,31 @@ int main (int argc, char *argv[])
        int             i;
        ext2_filsys     fs;
        ext2_inode_scan scan;
-       ino_t   ino;
+       ext2_ino_t      ino;
        struct ext2_inode inode;
 
-       printf("size of inode=%d\n", sizeof(inode));
+       printf(_("size of inode=%d\n"), sizeof(inode));
 
        device_name = "/dev/hda3";
-       
+
        init_resource_track(&global_rtrack);
 
        retval = ext2fs_open(device_name, 0,
                             0, 0, unix_io_manager, &fs);
        if (retval) {
-               com_err(argv[0], retval, "while trying to open %s",
+               com_err(argv[0], retval, _("while trying to open %s"),
                        device_name);
                exit(1);
        }
 
        retval = ext2fs_open_inode_scan(fs, 0, &scan);
        if (retval) {
-               com_err(argv[0], retval, "while opening inode scan");
+               com_err(argv[0], retval, _("while opening inode scan"));
                exit(1);
        }
        retval = ext2fs_get_next_inode(scan, &ino, &inode);
        if (retval) {
-               com_err(argv[0], retval, "while starting inode scan");
+               com_err(argv[0], retval, _("while starting inode scan"));
                exit(1);
        }
        while (ino) {
@@ -128,15 +127,15 @@ int main (int argc, char *argv[])
                retval = ext2fs_get_next_inode(scan, &ino, &inode);
                if (retval) {
                        com_err(argv[0], retval,
-                               "while doing inode scan");
+                               _("while doing inode scan"));
                        exit(1);
                }
        }
-       
 
-       ext2fs_close(fs);
-       
+
+       ext2fs_close_free(&fs);
+
        print_resource_track(&global_rtrack);
-       
+
        return exit_value;
 }