ChangeLog, debugfs.8.in, debugfs.c:

  Add a -V option which displays the current version.
ChangeLog, unix.c:
  unix.c (e2fsck_update_progress): Remove unused variables.
ChangeLog, inode.c:
  inode.c (get_next_blockgroup): Fix bug where if get_next_blockgroup()
  	is called early because of a missing inode table in a block group, the
  	current_inode counter wasn't incremented correctly.
ChangeLog, tst_uuid.c:
  tst_uuid.c (main): Fixed bogus declaration of the main's argv parameter.
ChangeLog, test_icount.c:
  test_icount.c (main): Fix main() declaration so that it returns int,
  	not void.
Many files:
  fsck.c (ignore): Remove unused variable cp.
  chattr.c (fatal_error):
  tune2fs.c (usage):
  lsattr.c (usage):
  dumpe2fs.c (usage):
  badblocks.c (usage): Remove volatile from declaration.
  fsck.c: Change use of strdup to be string_copy, since we don't trust
  	what glibc is doing with strdup.  (Whatever it is, it isn't pretty.)

1 files changed, 4 insertions, 4 deletions

diff --git a/misc/lsattr.c b/misc/lsattr.c
index 839df0fd..73823cce 100644
--- a/misc/lsattr.c
+++ b/misc/lsattr.c
@@ -49,10 +49,10 @@ int l_opt = 0;
 int recursive = 0;
 int v_opt = 0;
 
-static void volatile usage (void)
+static void usage(void)
 {
-	fprintf (stderr, "Usage: %s [-Radlv] [files...]\n", program_name);
-	exit (1);
+	fprintf(stderr, "Usage: %s [-Radlv] [files...]\n", program_name);
+	exit(1);
 }
 
 static void list_attributes (const char * name)
@@ -148,7 +148,7 @@ int main (int argc, char ** argv)
 				v_opt = 1;
 				break;
 			default:
-				usage ();
+				usage();
 		}
 
 	if (optind > argc - 1)