From: Sami Kerola <kerolasa@iki.fi>
Date: Wed, 3 Sep 2014 19:24:11 +0000 (+0100)
Subject: mkfs.minix: fix couple compiler warnings
X-Git-Tag: v2.26-rc1~447^2~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e9b0ac10f270c30351e4b09a2221e2d7137fa7f1;p=thirdparty%2Futil-linux.git

mkfs.minix: fix couple compiler warnings

disk-utils/mkfs.minix.c:366:3: warning: ISO C forbids 'return' with
expression, in function returning void [-Wpedantic]

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---

diff --git a/disk-utils/mkfs.minix.c b/disk-utils/mkfs.minix.c
index 9fdfc63794..2dafc869fd 100644
--- a/disk-utils/mkfs.minix.c
+++ b/disk-utils/mkfs.minix.c
@@ -362,9 +362,11 @@ static void make_bad_inode_v2_v3 (void)
 
 static void make_bad_inode(void)
 {
-	if (fs_version < 2)
-		return make_bad_inode_v1();
-	return make_bad_inode_v2_v3();
+	if (fs_version < 2) {
+		make_bad_inode_v1();
+		return;
+	}
+	make_bad_inode_v2_v3();
 }
 
 static void make_root_inode_v1(void) {
@@ -412,9 +414,11 @@ static void make_root_inode_v2_v3 (void) {
 
 static void make_root_inode(void)
 {
-	if (fs_version < 2)
-		return make_root_inode_v1();
-	return make_root_inode_v2_v3();
+	if (fs_version < 2) {
+		make_root_inode_v1();
+		return;
+	}
+	make_root_inode_v2_v3();
 }
 
 static void super_set_nzones(void)