From baca1759129945fcd03d96ccc840892401b5a1af Mon Sep 17 00:00:00 2001
From: Denis Vlasenko
Date: Sun, 11 Mar 2007 13:43:10 +0000
Subject: kill superfluous returns at the end of void functions

---
 e2fsprogs/old_e2fsprogs/blkid/devname.c  | 1 -
 e2fsprogs/old_e2fsprogs/blkid/devno.c    | 1 -
 e2fsprogs/old_e2fsprogs/blkid/read.c     | 1 -
 e2fsprogs/old_e2fsprogs/e2fsck.c         | 5 -----
 e2fsprogs/old_e2fsprogs/ext2fs/bitmaps.c | 2 --
 e2fsprogs/old_e2fsprogs/ext2fs/inode.c   | 1 -
 e2fsprogs/old_e2fsprogs/fsck.c           | 1 -
 e2fsprogs/old_e2fsprogs/mke2fs.c         | 1 -
 e2fsprogs/old_e2fsprogs/tune2fs.c        | 1 -
 e2fsprogs/old_e2fsprogs/uuid/gen_uuid.c  | 1 -
 10 files changed, 15 deletions(-)

(limited to 'e2fsprogs')

diff --git a/e2fsprogs/old_e2fsprogs/blkid/devname.c b/e2fsprogs/old_e2fsprogs/blkid/devname.c
index 3d11734..071aa5a 100644
--- a/e2fsprogs/old_e2fsprogs/blkid/devname.c
+++ b/e2fsprogs/old_e2fsprogs/blkid/devname.c
@@ -131,7 +131,6 @@ set_pri:
 		pri = BLKID_PRI_MD;
 	if (dev)
 		dev->bid_pri = pri;
-	return;
 }
 
 #define PROC_PARTITIONS "/proc/partitions"
diff --git a/e2fsprogs/old_e2fsprogs/blkid/devno.c b/e2fsprogs/old_e2fsprogs/blkid/devno.c
index 13e7f1a..ae326f8 100644
--- a/e2fsprogs/old_e2fsprogs/blkid/devno.c
+++ b/e2fsprogs/old_e2fsprogs/blkid/devno.c
@@ -122,7 +122,6 @@ static void scan_dir(char *dir_name, dev_t devno, struct dir_list **list,
 		}
 	}
 	closedir(dir);
-	return;
 }
 
 /* Directories where we will try to search for device numbers */
diff --git a/e2fsprogs/old_e2fsprogs/blkid/read.c b/e2fsprogs/old_e2fsprogs/blkid/read.c
index bb02a2e..276e62a 100644
--- a/e2fsprogs/old_e2fsprogs/blkid/read.c
+++ b/e2fsprogs/old_e2fsprogs/blkid/read.c
@@ -410,7 +410,6 @@ void blkid_read_cache(blkid_cache cache)
 	return;
 errout:
 	close(fd);
-	return;
 }
 
 #ifdef TEST_PROGRAM
diff --git a/e2fsprogs/old_e2fsprogs/e2fsck.c b/e2fsprogs/old_e2fsprogs/e2fsck.c
index d506db2..a0f6916 100644
--- a/e2fsprogs/old_e2fsprogs/e2fsck.c
+++ b/e2fsprogs/old_e2fsprogs/e2fsck.c
@@ -2286,7 +2286,6 @@ err_out:
 	fix_problem(ctx, PR_0_ERR_MOVE_JOURNAL, &pctx);
 	fs->super->s_state &= ~EXT2_VALID_FS;
 	ext2fs_mark_super_dirty(fs);
-	return;
 }
 
 /*
@@ -7328,8 +7327,6 @@ static void fix_dotdot(e2fsck_t ctx, struct dir_info *dir, ext2_ino_t parent)
 		ext2fs_unmark_valid(fs);
 	}
 	dir->dotdot = parent;
-
-	return;
 }
 
 /*
@@ -11969,7 +11966,6 @@ static void check_super_block(e2fsck_t ctx)
 	 * Move the ext3 journal file, if necessary.
 	 */
 	e2fsck_move_ext3_journal(ctx);
-	return;
 }
 
 /*
@@ -12666,7 +12662,6 @@ static void check_mount(e2fsck_t ctx)
 		printf(_("check aborted.\n"));
 		exit (0);
 	}
-	return;
 }
 
 static int is_on_batt(void)
diff --git a/e2fsprogs/old_e2fsprogs/ext2fs/bitmaps.c b/e2fsprogs/old_e2fsprogs/ext2fs/bitmaps.c
index 712a4a9..637ed27 100644
--- a/e2fsprogs/old_e2fsprogs/ext2fs/bitmaps.c
+++ b/e2fsprogs/old_e2fsprogs/ext2fs/bitmaps.c
@@ -105,8 +105,6 @@ void ext2fs_set_bitmap_padding(ext2fs_generic_bitmap map)
 
 	for (i=map->end+1, j = i - map->start; i <= map->real_end; i++, j++)
 		ext2fs_set_bit(j, map->bitmap);
-
-	return;
 }
 
 errcode_t ext2fs_allocate_inode_bitmap(ext2_filsys fs,
diff --git a/e2fsprogs/old_e2fsprogs/ext2fs/inode.c b/e2fsprogs/old_e2fsprogs/ext2fs/inode.c
index 2ff9fe6..5e0d081 100644
--- a/e2fsprogs/old_e2fsprogs/ext2fs/inode.c
+++ b/e2fsprogs/old_e2fsprogs/ext2fs/inode.c
@@ -178,7 +178,6 @@ void ext2fs_close_inode_scan(ext2_inode_scan scan)
 	ext2fs_free_mem(&scan->temp_buffer);
 	scan->temp_buffer = NULL;
 	ext2fs_free_mem(&scan);
-	return;
 }
 
 void ext2fs_set_inode_callback(ext2_inode_scan scan,
diff --git a/e2fsprogs/old_e2fsprogs/fsck.c b/e2fsprogs/old_e2fsprogs/fsck.c
index ce2a968..6e8a637 100644
--- a/e2fsprogs/old_e2fsprogs/fsck.c
+++ b/e2fsprogs/old_e2fsprogs/fsck.c
@@ -372,7 +372,6 @@ static void free_instance(struct fsck_instance *i)
 	if (i->base_device)
 		free(i->base_device);
 	free(i);
-	return;
 }
 
 static struct fs_info *create_fs_device(const char *device, const char *mntpnt,
diff --git a/e2fsprogs/old_e2fsprogs/mke2fs.c b/e2fsprogs/old_e2fsprogs/mke2fs.c
index 45a6723..6cdb16c 100644
--- a/e2fsprogs/old_e2fsprogs/mke2fs.c
+++ b/e2fsprogs/old_e2fsprogs/mke2fs.c
@@ -164,7 +164,6 @@ static void set_fs_defaults(const char *fs_type,
 static void invalid_block(ext2_filsys fs EXT2FS_ATTR((unused)), blk_t blk)
 {
 	bb_error_msg("Bad block %u out of range; ignored", blk);
-	return;
 }
 
 /*
diff --git a/e2fsprogs/old_e2fsprogs/tune2fs.c b/e2fsprogs/old_e2fsprogs/tune2fs.c
index 12af006..e5a9337 100644
--- a/e2fsprogs/old_e2fsprogs/tune2fs.c
+++ b/e2fsprogs/old_e2fsprogs/tune2fs.c
@@ -340,7 +340,6 @@ static void add_journal(ext2_filsys fs)
 			fs->flags &= ~EXT2_FLAG_SUPER_ONLY;
 	}
 	print_check_message(fs);
-	return;
 }
 
 /*
diff --git a/e2fsprogs/old_e2fsprogs/uuid/gen_uuid.c b/e2fsprogs/old_e2fsprogs/uuid/gen_uuid.c
index 9d700a0..03a9f37 100644
--- a/e2fsprogs/old_e2fsprogs/uuid/gen_uuid.c
+++ b/e2fsprogs/old_e2fsprogs/uuid/gen_uuid.c
@@ -117,7 +117,6 @@ static void get_random_bytes(void *buf, int nbytes)
 	 */
 	for (cp = buf, i = 0; i < nbytes; i++)
 		*cp++ ^= (rand() >> 7) & 0xFF;
-	return;
 }
 
 /*
-- 
cgit v1.1