btrfs-progs: unify argc min/max checking

We don't want to modify argc.

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

12 files changed, 19 insertions, 31 deletions

diff --git a/btrfs-calc-size.c b/btrfs-calc-size.c
index e3f02d87..45fb5106 100644
--- a/btrfs-calc-size.c
+++ b/btrfs-calc-size.c
@@ -450,8 +450,7 @@ int main(int argc, char **argv)
 	}
 
 	set_argv0(argv);
-	argc = argc - optind;
-	if (check_argc_min(argc, 1)) {
+	if (check_argc_min(argc - optind, 1)) {
 		usage();
 		exit(1);
 	}
diff --git a/btrfs-convert.c b/btrfs-convert.c
index 4baa68ec..1768e4e9 100644
--- a/btrfs-convert.c
+++ b/btrfs-convert.c
@@ -3165,9 +3165,8 @@ int main(int argc, char *argv[])
 				return c != GETOPT_VAL_HELP;
 		}
 	}
-	argc = argc - optind;
 	set_argv0(argv);
-	if (check_argc_exact(argc, 1)) {
+	if (check_argc_exact(argc - optind, 1)) {
 		print_usage();
 		return 1;
 	}
diff --git a/btrfs-corrupt-block.c b/btrfs-corrupt-block.c
index 18853d3c..98492324 100644
--- a/btrfs-corrupt-block.c
+++ b/btrfs-corrupt-block.c
@@ -1142,8 +1142,7 @@ int main(int argc, char **argv)
 		}
 	}
 	set_argv0(argv);
-	argc = argc - optind;
-	if (check_argc_min(argc, 1))
+	if (check_argc_min(argc - optind, 1))
 		print_usage(1);
 	dev = argv[optind];
 
diff --git a/btrfs-find-root.c b/btrfs-find-root.c
index 2d5bbb2a..e6ccc532 100644
--- a/btrfs-find-root.c
+++ b/btrfs-find-root.c
@@ -185,8 +185,7 @@ int main(int argc, char **argv)
 	}
 
 	set_argv0(argv);
-	argc = argc - optind;
-	if (check_argc_min(argc, 1)) {
+	if (check_argc_min(argc - optind, 1)) {
 		usage();
 		exit(1);
 	}
diff --git a/btrfs-fragments.c b/btrfs-fragments.c
index 17768c3f..9be3dd33 100644
--- a/btrfs-fragments.c
+++ b/btrfs-fragments.c
@@ -428,8 +428,7 @@ int main(int argc, char **argv)
 	}
 
 	set_argv0(argv);
-	argc = argc - optind;
-	if (check_argc_min(argc, 1)) {
+	if (check_argc_min(argc - optind, 1)) {
 		usage();
 		exit(1);
 	}
diff --git a/btrfs-image.c b/btrfs-image.c
index c7fa18fb..33966fd2 100644
--- a/btrfs-image.c
+++ b/btrfs-image.c
@@ -2735,12 +2735,11 @@ int main(int argc, char *argv[])
 		}
 	}
 
-	argc = argc - optind;
 	set_argv0(argv);
-	if (check_argc_min(argc, 2))
+	if (check_argc_min(argc - optind, 2))
 		print_usage(1);
 
-	dev_cnt = argc - 1;
+	dev_cnt = argc - optind - 1;
 
 	if (create) {
 		if (old_restore) {
diff --git a/btrfs-map-logical.c b/btrfs-map-logical.c
index 152b141e..18a6acac 100644
--- a/btrfs-map-logical.c
+++ b/btrfs-map-logical.c
@@ -248,8 +248,7 @@ int main(int argc, char **argv)
 		}
 	}
 	set_argv0(argv);
-	argc = argc - optind;
-	if (check_argc_min(argc, 1))
+	if (check_argc_min(argc - optind, 1))
 		print_usage();
 	if (logical == 0)
 		print_usage();
diff --git a/btrfs-select-super.c b/btrfs-select-super.c
index 48f37266..41997dde 100644
--- a/btrfs-select-super.c
+++ b/btrfs-select-super.c
@@ -65,9 +65,7 @@ int main(int argc, char **argv)
 		}
 	}
 	set_argv0(argv);
-	argc = argc - optind;
-
-	if (check_argc_exact(argc, 1))
+	if (check_argc_exact(argc - optind, 1))
 		print_usage();
 
 	if (bytenr == 0) {
diff --git a/btrfs-zero-log.c b/btrfs-zero-log.c
index 4c4ed107..f5ca9fcf 100644
--- a/btrfs-zero-log.c
+++ b/btrfs-zero-log.c
@@ -39,23 +39,23 @@ int main(int argc, char **argv)
 	int ret;
 
 	set_argv0(argv);
-	if (check_argc_exact(argc, 2))
+	if (check_argc_exact(argc - optind, 1))
 		print_usage();
 
 	radix_tree_init();
 
 	printf("WARNING: this utility is deprecated, please use 'btrfs rescue zero-log'\n\n");
 
-	if ((ret = check_mounted(argv[1])) < 0) {
+	if ((ret = check_mounted(argv[optind])) < 0) {
 		fprintf(stderr, "ERROR: could not check mount status: %s\n", strerror(-ret));
 		goto out;
 	} else if (ret) {
-		fprintf(stderr, "ERROR: %s is currently mounted\n", argv[1]);
+		fprintf(stderr, "ERROR: %s is currently mounted\n", argv[optind]);
 		ret = -EBUSY;
 		goto out;
 	}
 
-	root = open_ctree(argv[1], 0, OPEN_CTREE_WRITES | OPEN_CTREE_PARTIAL);
+	root = open_ctree(argv[optind], 0, OPEN_CTREE_WRITES | OPEN_CTREE_PARTIAL);
 	if (!root) {
 		fprintf(stderr, "ERROR: cannot open ctree\n");
 		return 1;
@@ -63,7 +63,7 @@ int main(int argc, char **argv)
 
 	sb = root->fs_info->super_copy;
 	printf("Clearing log on %s, previous log_root %llu, level %u\n",
-			argv[1],
+			argv[optind],
 			(unsigned long long)btrfs_super_log_root(sb),
 			(unsigned)btrfs_super_log_root_level(sb));
 	trans = btrfs_start_transaction(root, 1);
diff --git a/btrfstune.c b/btrfstune.c
index 0907aa9e..f731e3d2 100644
--- a/btrfstune.c
+++ b/btrfstune.c
@@ -442,9 +442,8 @@ int main(int argc, char *argv[])
 	}
 
 	set_argv0(argv);
-	argc = argc - optind;
 	device = argv[optind];
-	if (check_argc_exact(argc, 1)) {
+	if (check_argc_exact(argc - optind, 1)) {
 		print_usage();
 		return 1;
 	}
diff --git a/cmds-check.c b/cmds-check.c
index 0165fba4..8fb97712 100644
--- a/cmds-check.c
+++ b/cmds-check.c
@@ -9579,9 +9579,8 @@ int cmd_check(int argc, char **argv)
 				break;
 		}
 	}
-	argc = argc - optind;
 
-	if (check_argc_exact(argc, 1))
+	if (check_argc_exact(argc - optind, 1))
 		usage(cmd_check_usage);
 
 	if (ctx.progress_enabled) {
diff --git a/cmds-device.c b/cmds-device.c
index ee999a05..3f800e6d 100644
--- a/cmds-device.c
+++ b/cmds-device.c
@@ -246,10 +246,10 @@ static int cmd_device_scan(int argc, char **argv)
 		}
 	}
 
-	if (all && check_argc_max(argc, 2))
+	if (all && check_argc_max(argc - optind, 1))
 		usage(cmd_device_scan_usage);
 
-	if (all || argc == 1) {
+	if (all || argc - optind == 1) {
 		printf("Scanning for Btrfs filesystems\n");
 		ret = btrfs_scan_lblkid();
 		error_on(ret, "error %d while scanning", ret);
@@ -372,8 +372,7 @@ static int cmd_device_stats(int argc, char **argv)
 		}
 	}
 
-	argc = argc - optind;
-	if (check_argc_exact(argc, 1))
+	if (check_argc_exact(argc - optind, 1))
 		usage(cmd_device_stats_usage);
 
 	dev_path = argv[optind];