Fix gcc -Wall nits.

debugfs/debugfs.c

@@ -478,7 +478,6 @@ void do_stat(int argc, char *argv[])
 {
 	ext2_ino_t	inode;
 	struct ext2_inode inode_buf;
-	int 		retval;
 
 	if (common_inode_args_process(argc, argv, &inode, 0))
 		return;
@@ -509,7 +508,6 @@ void do_chroot(int argc, char *argv[])
 void do_clri(int argc, char *argv[])
 {
 	ext2_ino_t inode;
-	int retval;
 	struct ext2_inode inode_buf;
 
 	if (common_inode_args_process(argc, argv, &inode, CHECK_FS_RW))
@@ -686,7 +684,6 @@ void do_modify_inode(int argc, char *argv[])
 	struct ext2_inode inode;
 	ext2_ino_t	inode_num;
 	int 		i;
-	errcode_t	retval;
 	unsigned char	*frag, *fsize;
 	char		buf[80];
 	int 		os = current_fs->super->s_creator_os;
@@ -866,7 +863,6 @@ static int mark_blocks_proc(ext2_filsys fs, blk_t *blocknr,
 			    int blockcnt, void *private)
 {
 	blk_t	block;
-	dgrp_t	group;
 
 	block = *blocknr;
 	ext2fs_block_alloc_stats(fs, block, +1);
@@ -877,8 +873,6 @@ void do_undel(int argc, char *argv[])
 {
 	ext2_ino_t	ino;
 	struct ext2_inode inode;
-	int		retval;
-	dgrp_t group;
 
 	if (common_args_process(argc, argv, 3, 3, "undelete",
 				"<inode_num> <dest_name>",
@@ -1081,7 +1075,6 @@ void do_write(int argc, char *argv[])
 	ext2_ino_t	newfile;
 	errcode_t	retval;
 	struct ext2_inode inode;
-	dgrp_t		group;
 
 	if (common_args_process(argc, argv, 3, 3, "write",
 				"<native file> <new file>", CHECK_FS_RW))
@@ -1255,7 +1248,6 @@ static int release_blocks_proc(ext2_filsys fs, blk_t *blocknr,
 			       int blockcnt, void *private)
 {
 	blk_t	block;
-	dgrp_t	group;
 
 	block = *blocknr;
 	ext2fs_block_alloc_stats(fs, block, -1);
@@ -1265,7 +1257,6 @@ static int release_blocks_proc(ext2_filsys fs, blk_t *blocknr,
 static void kill_file_by_inode(ext2_ino_t inode)
 {
 	struct ext2_inode inode_buf;
-	int	group;
 
 	if (debugfs_read_inode(inode, &inode_buf, 0))
 		return;

debugfs/debugfs.h

@@ -80,6 +80,7 @@ extern void do_show_super_stats(int argc, char **argv);
 extern void do_kill_file(int argc, char **argv);
 extern void do_rm(int argc, char **argv);
 extern void do_link(int argc, char **argv);
+extern void do_undel(int argc, char **argv);
 extern void do_unlink(int argc, char **argv);
 extern void do_find_free_block(int argc, char **argv);
 extern void do_find_free_inode(int argc, char **argv);

debugfs/dump.c

@@ -296,7 +296,6 @@ static int rdump_dirent(struct ext2_dir_entry *dirent, int offset,
 	int thislen;
 	const char *dumproot = private;
 	struct ext2_inode inode;
-	errcode_t retval;
 
 	thislen = ((dirent->name_len & 0xFF) < EXT2_NAME_LEN
 		   ? (dirent->name_len & 0xFF) : EXT2_NAME_LEN);
@@ -315,7 +314,6 @@ void do_rdump(int argc, char **argv)
 {
 	ext2_ino_t ino;
 	struct ext2_inode inode;
-	errcode_t retval;
 	struct stat st;
 	int i;
 	char *p;

debugfs/ls.c

@@ -53,7 +53,6 @@ static int list_dir_proc(ext2_ino_t dir,
 {
 	struct ext2_inode	inode;
 	ext2_ino_t		ino;
-	errcode_t		retval;
 	struct tm		*tm_p;
 	time_t			modtime;
 	char			name[EXT2_NAME_LEN];
@@ -79,7 +78,7 @@ static int list_dir_proc(ext2_ino_t dir,
 	if (ls->options & LONG_OPT) {
 		if (ino) {
 			if (debugfs_read_inode(ino, &inode, name))
-				return;
+				return 0;
 			modtime = inode.i_mtime;
 			tm_p = localtime(&modtime);
 			sprintf(datestr, "%2d-%s-%4d %02d:%02d",

lib/ext2fs/ismounted.c

@@ -164,7 +164,7 @@ static int is_swap_device(const char *file)
 
 	f = fopen("/proc/swaps", "r");
 	if (!f)
-		return;
+		return 0;
 	/* Skip the first line */
 	fgets(buf, sizeof(buf), f);
 	while (!feof(f)) {