From b74d1d89eb478f1dee108adc1a274b69ce4b2557 Mon Sep 17 00:00:00 2001
From: Theodore Ts'o <tytso@mit.edu>
Date: Fri, 12 Jan 2001 17:23:52 +0000
Subject: [PATCH] ChangeLog, debugfs.c, debugfs.h:   debugfs.h, debugfs.c
 (do_show_super_stats): Use full words instead of   	pluralism hack to make
 I18N conversion easier.  Clean up gcc -Wall   	complaints.

---
 debugfs/ChangeLog |  6 ++++++
 debugfs/debugfs.c | 15 ++++++++-------
 debugfs/debugfs.h |  3 +++
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/debugfs/ChangeLog b/debugfs/ChangeLog
index 9d1bbd70..50594265 100644
--- a/debugfs/ChangeLog
+++ b/debugfs/ChangeLog
@@ -1,3 +1,9 @@
+2001-01-12  Theodore Ts'o  <tytso@valinux.com>
+
+	*  debugfs.h,  debugfs.c  (do_show_super_stats): Use  full words
+		instead of pluralism hack  to make I18N conversion easier.
+		Clean up gcc -Wall complaints.
+
 2001-01-11    <tytso@snap.thunk.org>
 
 	* debugfs.c, debugfs.h, dump.c, icheck.c, ls.c, lsdel.c, ncheck.c,
diff --git a/debugfs/debugfs.c b/debugfs/debugfs.c
index 003ccefe..dde7e74a 100644
--- a/debugfs/debugfs.c
+++ b/debugfs/debugfs.c
@@ -289,17 +289,18 @@ void do_show_super_stats(int argc, char *argv[])
 		fprintf(out, " Group %2d: block bitmap at %d, "
 		        "inode bitmap at %d, "
 		        "inode table at %d\n"
-		        "           %d free block%s, "
-		        "%d free inode%s, "
-		        "%d used director%s\n",
+		        "           %d free %s, "
+		        "%d free %s, "
+		        "%d used %s\n",
 		        i, gdp->bg_block_bitmap,
 		        gdp->bg_inode_bitmap, gdp->bg_inode_table,
 		        gdp->bg_free_blocks_count,
-		        gdp->bg_free_blocks_count != 1 ? "s" : "",
+		        gdp->bg_free_blocks_count != 1 ? "blocks" : "block",
 		        gdp->bg_free_inodes_count,
-		        gdp->bg_free_inodes_count != 1 ? "s" : "",
+		        gdp->bg_free_inodes_count != 1 ? "inodes" : "inode",
 		        gdp->bg_used_dirs_count,
-		        gdp->bg_used_dirs_count != 1 ? "ies" : "y");
+		        gdp->bg_used_dirs_count != 1 ? "directories"
+				: "directory");
 	close_pager(out);
 }
 
@@ -470,7 +471,7 @@ static void dump_inode(ext2_ino_t inode_num, struct ext2_inode inode)
 		  time_to_string(inode.i_dtime));
 	if (LINUX_S_ISLNK(inode.i_mode) && inode.i_blocks == 0)
 		fprintf(out, "Fast_link_dest: %.*s\n",
-			inode.i_size, (char *)inode.i_block);
+			(int) inode.i_size, (char *)inode.i_block);
 	else
 		dump_blocks(out, inode_num);
 	close_pager(out);
diff --git a/debugfs/debugfs.h b/debugfs/debugfs.h
index d1b8e257..0fc504ed 100644
--- a/debugfs/debugfs.h
+++ b/debugfs/debugfs.h
@@ -40,6 +40,9 @@ extern void do_icheck(int argc, char **argv);
 /* ncheck.c */
 extern void do_ncheck(int argc, char **argv);
 
+/* set_super.c */
+extern void do_set_super(int argc, char **);
+
 /* debugfs.c */
 extern void do_dirty_filesys(int argc, char **argv);
 extern void do_open_filesys(int argc, char **argv);