Whamcloud - gitweb
build: add RHEL6 .spec file for packaging
[tools/e2fsprogs.git] / e2fsck / scantest.c
index 9727a9f..ed3595f 100644 (file)
@@ -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,9 +12,6 @@
 #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>
@@ -55,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);
@@ -78,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));
@@ -100,7 +98,7 @@ int main (int argc, char *argv[])
        printf(_("size of inode=%d\n"), sizeof(inode));
 
        device_name = "/dev/hda3";
-       
+
        init_resource_track(&global_rtrack);
 
        retval = ext2fs_open(device_name, 0,
@@ -133,11 +131,11 @@ int main (int argc, char *argv[])
                        exit(1);
                }
        }
-       
 
-       ext2fs_close(fs);
-       
+
+       ext2fs_close_free(&fs);
+
        print_resource_track(&global_rtrack);
-       
+
        return exit_value;
 }