emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko
2009-11-28 15:18:53 +01:00
parent 86cfb70ca5
commit e992bae6f9
20 changed files with 79 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
util-linux/fdisk.c
View File

@ -2821,7 +2821,7 @@ unknown_command(int c)
#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 @@ int fdisk_main(int argc, char **argv)
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 fdisk_main(int argc, char **argv)
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 @@ int fdisk_main(int argc, char **argv)
#endif
#if ENABLE_FEATURE_FDISK_WRITABLE
if (argc != 1)
if (!argv[0] || argv[1])
bb_show_usage();
disk_device = argv[0];