From 2a3013b80704b7d9128cbe2c746550e570eb5a02 Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Mon, 30 Mar 1998 01:08:41 +0000 Subject: [PATCH] ChangeLog, test_icount.c, test_icount.h: test_icount.h (do_dump, do_validate): Add prototypes to fix -Wall warnings. test_icount.c: Fix -Wall warnings. ChangeLog, extent.c, main.c: extent.c (extent_cmp): Add const to cast to prevent -Wall warning. main.c (check_mount): Rename function argument to prevent -Wall warning. --- resize/ChangeLog | 7 +++++++ resize/extent.c | 4 ++-- resize/main.c | 8 ++++---- tests/progs/ChangeLog | 7 +++++++ tests/progs/test_icount.c | 2 +- tests/progs/test_icount.h | 3 +++ 6 files changed, 24 insertions(+), 7 deletions(-) diff --git a/resize/ChangeLog b/resize/ChangeLog index fe936038..d18e32fd 100644 --- a/resize/ChangeLog +++ b/resize/ChangeLog @@ -1,3 +1,10 @@ +1998-03-29 Theodore Ts'o + + * extent.c (extent_cmp): Add const to cast to prevent -Wall warning. + + * main.c (check_mount): Rename function argument to prevent -Wall + warning. + 1998-03-24 Theodore Ts'o * main.c (main): Check to make sure we can really resize this diff --git a/resize/extent.c b/resize/extent.c index b51e6532..56fb62a9 100644 --- a/resize/extent.c +++ b/resize/extent.c @@ -124,8 +124,8 @@ static int extent_cmp(const void *a, const void *b) const struct ext2_extent_entry *db_a; const struct ext2_extent_entry *db_b; - db_a = (struct ext2_extent_entry *) a; - db_b = (struct ext2_extent_entry *) b; + db_a = (const struct ext2_extent_entry *) a; + db_b = (const struct ext2_extent_entry *) b; return (db_a->old_loc - db_b->old_loc); } diff --git a/resize/main.c b/resize/main.c index 756e3cb9..4f7cc6f2 100644 --- a/resize/main.c +++ b/resize/main.c @@ -79,23 +79,23 @@ static errcode_t resize_progress_func(ext2_resize_t rfs, int pass, return 0; } -static void check_mount(char *device_name) +static void check_mount(char *device) { errcode_t retval; int mount_flags; - retval = ext2fs_check_if_mounted(device_name, &mount_flags); + retval = ext2fs_check_if_mounted(device, &mount_flags); if (retval) { com_err("ext2fs_check_if_mount", retval, "while determining whether %s is mounted.", - device_name); + device); return; } if (!(mount_flags & EXT2_MF_MOUNTED)) return; fprintf(stderr, "%s is mounted; can't resize a " - "mounted filesystem!\n\n", device_name); + "mounted filesystem!\n\n", device); exit(1); } diff --git a/tests/progs/ChangeLog b/tests/progs/ChangeLog index 5d36eccb..98048723 100644 --- a/tests/progs/ChangeLog +++ b/tests/progs/ChangeLog @@ -1,3 +1,10 @@ +1998-03-29 Theodore Ts'o + + * test_icount.h (do_dump, do_validate): Add prototypes to fix + -Wall warnings. + + * test_icount.c: Fix -Wall warnings. + Sat Oct 25 18:50:33 1997 Theodore Ts'o * Makefile.in (PROGS): Remove test_rel from the test programs that diff --git a/tests/progs/test_icount.c b/tests/progs/test_icount.c index 5156cfa0..53cc4209 100644 --- a/tests/progs/test_icount.c +++ b/tests/progs/test_icount.c @@ -240,7 +240,7 @@ void do_get_size(int argc, char **argv) if (check_icount(argv[0])) return; size = ext2fs_get_icount_size(test_icount); - printf("Size of icount is: %u\n", size); + printf("Size of icount is: %lu\n", size); } static int source_file(const char *cmd_file, int sci_idx) diff --git a/tests/progs/test_icount.h b/tests/progs/test_icount.h index 9678a688..59ea1a47 100644 --- a/tests/progs/test_icount.h +++ b/tests/progs/test_icount.h @@ -5,3 +5,6 @@ void do_increment(int argc, char **argv); void do_decrement(int argc, char **argv); void do_store(int argc, char **argv); void do_get_size(int argc, char **argv); +void do_dump(int argc, char **argv); +void do_validate(int argc, char **argv); +