commit e992bae6f9adf3718c6263a36c004ead1c7272a8
author Denys Vlasenko <vda.linux@googlemail.com> Sat Nov 28 15:18:53 2009 +0100
committer Denys Vlasenko <vda.linux@googlemail.com> Sat Nov 28 15:18:53 2009 +0100
tree f0bc9e4fa145f58ab3f9838902e09f9cfba29648
parent 86cfb70ca5f2bde11f2d071bc59db75291d8552f

*: remove a few more cases of argc usage. -89 bytes.

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

util-linux/fdisk.c

diff --git a/util-linux/fdisk.c b/util-linux/fdisk.c
index 6a194fd..c9f57c6 100644
--- a/util-linux/fdisk.c
+++ b/util-linux/fdisk.c
@@ -2821,7 +2821,7 @@
 #endif
 
 int fdisk_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int fdisk_main(int argc, char **argv)
+int fdisk_main(int argc UNUSED_PARAM, char **argv)
 {
 	unsigned opt;
 	/*
@@ -2839,7 +2839,6 @@
 	opt_complementary = "b+:C+:H+:S+"; /* numeric params */
 	opt = getopt32(argv, "b:C:H:lS:u" IF_FEATURE_FDISK_BLKSIZE("s"),
 				&sector_size, &user_cylinders, &user_heads, &user_sectors);
-	argc -= optind;
 	argv += optind;
 	if (opt & OPT_b) { // -b
 		/* Ugly: this sector size is really per device,
@@ -2883,14 +2882,14 @@
 		int j;
 
 		nowarn = 1;
-		if (argc <= 0)
+		if (!argv[0])
 			bb_show_usage();
-		for (j = 0; j < argc; j++) {
+		for (j = 0; argv[j]; j++) {
 			unsigned long long size;
 			fd = xopen(argv[j], O_RDONLY);
 			size = bb_BLKGETSIZE_sectors(fd) / 2;
 			close(fd);
-			if (argc == 1)
+			if (argv[1])
 				printf("%llu\n", size);
 			else
 				printf("%s: %llu\n", argv[j], size);
@@ -2900,7 +2899,7 @@
 #endif
 
 #if ENABLE_FEATURE_FDISK_WRITABLE
-	if (argc != 1)
+	if (!argv[0] || argv[1])
 		bb_show_usage();
 
 	disk_device = argv[0];