File 0015-btrfs-progs-cleanup-dead-return-after-usag... of Package btrfsprogs

Overview Repositories Revisions Requests Users Attributes Meta

File 0015-btrfs-progs-cleanup-dead-return-after-usage-for-fi-d.patch of Package btrfsprogs (Revision 99f3b17642e27bc21f7ad51df06e6847)

Currently displaying revision 99f3b17642e27bc21f7ad51df06e6847 , Show latest

From a604369c26e4e816579c59d7a595279b1b720cbc Mon Sep 17 00:00:00 2001
From: Gui Hecheng <guihc.fnst@cn.fujitsu.com>
Date: Thu, 6 Mar 2014 11:36:46 +0800
Subject: [PATCH 26/42] btrfs-progs: cleanup dead return after usage() for
 fi-disk_usage

The usage() calls exit() internally, so remove the return after it.

Signed-off-by: Gui Hecheng <guihc.fnst@cn.fujitsu.com>
Signed-off-by: David Sterba <dsterba@suse.cz>
---
 cmds-fi-disk_usage.c | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/cmds-fi-disk_usage.c b/cmds-fi-disk_usage.c
index e4eb72be0a88..a3b06bebba72 100644
--- a/cmds-fi-disk_usage.c
+++ b/cmds-fi-disk_usage.c
@@ -494,10 +494,8 @@ int cmd_filesystem_df(int argc, char **argv)
 		}
 	}
 
-	if (check_argc_min(argc - optind, 1)) {
+	if (check_argc_min(argc - optind, 1))
 		usage(cmd_filesystem_df_usage);
-		return 21;
-	}
 
 	for (i = optind; i < argc ; i++) {
 		int r, fd;
@@ -914,10 +912,8 @@ int cmd_filesystem_disk_usage(int argc, char **argv)
 		}
 	}
 
-	if (check_argc_min(argc - optind, 1)) {
+	if (check_argc_min(argc - optind, 1))
 		usage(cmd_filesystem_disk_usage_usage);
-		return 21;
-	}
 
 	for (i = optind; i < argc ; i++) {
 		int r, fd;
@@ -1050,10 +1046,8 @@ int cmd_device_disk_usage(int argc, char **argv)
 		}
 	}
 
-	if (check_argc_min(argc - optind, 1)) {
+	if (check_argc_min(argc - optind, 1))
 		usage(cmd_device_disk_usage_usage);
-		return 21;
-	}
 
 	for (i = optind; i < argc ; i++) {
 		int r, fd;
-- 
1.9.0

Places

File 0015-btrfs-progs-cleanup-dead-return-after-usage-for-fi-d.patch of Package btrfsprogs (Revision 99f3b17642e27bc21f7ad51df06e6847)

Places