1 files changed, 22 insertions, 16 deletions

diff --git a/debugfs/debugfs.c b/debugfs/debugfs.c
index 1fcb9d37..2c13e4fd 100644
--- a/debugfs/debugfs.c
+++ b/debugfs/debugfs.c
@@ -229,7 +229,7 @@ static void print_features(struct ext2_super_block * s, FILE *f)
 
 void do_show_super_stats(int argc, char *argv[])
 {
-	int	i;
+	dgrp_t	i;
 	FILE 	*out;
 	struct ext2_group_desc *gdp;
 	int	c, header_only = 0;
@@ -285,7 +285,8 @@ void do_show_super_stats(int argc, char *argv[])
 	close_pager(out);
 }
 
-void do_dirty_filesys(int argc, char **argv)
+void do_dirty_filesys(int argc EXT2FS_ATTR((unused)), 
+		      char **argv EXT2FS_ATTR((unused)))
 {
 	if (check_fs_open(argv[0]))
 		return;
@@ -323,9 +324,11 @@ static void finish_range(struct list_blocks_struct *lb)
 	lb->first_block = 0;
 }
 
-static int list_blocks_proc(ext2_filsys fs, blk_t *blocknr,
-			    e2_blkcnt_t blockcnt, blk_t ref_block,
-			    int ref_offset, void *private)
+static int list_blocks_proc(ext2_filsys fs EXT2FS_ATTR((unused)), 
+			    blk_t *blocknr, e2_blkcnt_t blockcnt, 
+			    blk_t ref_block EXT2FS_ATTR((unused)),
+			    int ref_offset EXT2FS_ATTR((unused)), 
+			    void *private)
 {
 	struct list_blocks_struct *lb = (struct list_blocks_struct *) private;
 
@@ -857,7 +860,8 @@ void do_link(int argc, char *argv[])
 }
 
 static int mark_blocks_proc(ext2_filsys fs, blk_t *blocknr,
-			    int blockcnt, void *private)
+			    int blockcnt EXT2FS_ATTR((unused)), 
+			    void *private EXT2FS_ATTR((unused)))
 {
 	blk_t	block;
 
@@ -1131,11 +1135,11 @@ void do_write(int argc, char *argv[])
 
 void do_mknod(int argc, char *argv[])
 {
-	unsigned long	mode, major, minor, nr;
+	unsigned long	mode, major, minor;
 	ext2_ino_t	newfile;
 	errcode_t 	retval;
 	struct ext2_inode inode;
-	int		filetype;
+	int		filetype, nr;
 
 	if (check_fs_open(argv[0]))
 		return;
@@ -1243,7 +1247,8 @@ void do_mkdir(int argc, char *argv[])
 }
 
 static int release_blocks_proc(ext2_filsys fs, blk_t *blocknr,
-			       int blockcnt, void *private)
+			       int blockcnt EXT2FS_ATTR((unused)), 
+			       void *private EXT2FS_ATTR((unused)))
 {
 	blk_t	block;
 
@@ -1318,12 +1323,12 @@ struct rd_struct {
 	int		empty;
 };
 
-static int rmdir_proc(ext2_ino_t dir,
-		      int	entry,
+static int rmdir_proc(ext2_ino_t dir EXT2FS_ATTR((unused)),
+		      int	entry EXT2FS_ATTR((unused)),
 		      struct ext2_dir_entry *dirent,
-		      int	offset,
-		      int	blocksize,
-		      char	*buf,
+		      int	offset EXT2FS_ATTR((unused)),
+		      int	blocksize EXT2FS_ATTR((unused)),
+		      char	*buf EXT2FS_ATTR((unused)),
 		      void	*private)
 {
 	struct rd_struct *rds = (struct rd_struct *) private;
@@ -1397,7 +1402,8 @@ void do_rmdir(int argc, char *argv[])
 	}
 }
 
-void do_show_debugfs_params(int argc, char *argv[])
+void do_show_debugfs_params(int argc EXT2FS_ATTR((unused)), 
+			    char *argv[] EXT2FS_ATTR((unused)))
 {
 	FILE *out = stdout;
 
@@ -1484,7 +1490,7 @@ void do_imap(int argc, char *argv[])
 		EXT2_INODE_SIZE(current_fs->super);
 	block = offset >> EXT2_BLOCK_SIZE_BITS(current_fs->super);
 	if (!current_fs->group_desc[(unsigned)group].bg_inode_table) {
-		com_err(argv[0], 0, "Inode table for group %d is missing\n",
+		com_err(argv[0], 0, "Inode table for group %lu is missing\n",
 			group);
 		return;
 	}