From: David Sterba <dsterba@suse.com>
Date: Wed, 9 Mar 2016 13:29:29 +0000 (+0100)
Subject: btrfs-progs: unify argc min/max checking, a few more
X-Git-Tag: upstream/4.16.1~1706
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d08c73d40c9f25ef2d58d3f245e2ada7c8117a35;p=platform%2Fupstream%2Fbtrfs-progs.git

btrfs-progs: unify argc min/max checking, a few more

We don't want to modify argc.

Signed-off-by: David Sterba <dsterba@suse.com>
---

diff --git a/cmds-inspect-dump-tree.c b/cmds-inspect-dump-tree.c
index 17f9700..39c5818 100644
--- a/cmds-inspect-dump-tree.c
+++ b/cmds-inspect-dump-tree.c
@@ -185,8 +185,7 @@ int cmd_inspect_dump_tree(int argc, char **argv)
 		}
 	}
 
-	argc = argc - optind;
-	if (check_argc_exact(argc, 1))
+	if (check_argc_exact(argc - optind, 1))
 		usage(cmd_inspect_dump_tree_usage);
 
 	ret = check_arg_type(argv[optind]);
diff --git a/cmds-rescue.c b/cmds-rescue.c
index cacb144..f597997 100644
--- a/cmds-rescue.c
+++ b/cmds-rescue.c
@@ -67,8 +67,7 @@ static int cmd_rescue_chunk_recover(int argc, char *argv[])
 		}
 	}
 
-	argc = argc - optind;
-	if (check_argc_exact(argc, 1))
+	if (check_argc_exact(argc - optind, 1))
 		usage(cmd_rescue_chunk_recover_usage);
 
 	file = argv[optind];
@@ -133,8 +132,7 @@ static int cmd_rescue_super_recover(int argc, char **argv)
 			usage(cmd_rescue_super_recover_usage);
 		}
 	}
-	argc = argc - optind;
-	if (check_argc_exact(argc, 1))
+	if (check_argc_exact(argc - optind, 1))
 		usage(cmd_rescue_super_recover_usage);
 
 	dname = argv[optind];