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

don't pass argc in getopt32, it's superfluous

Browse Source 
(add/remove: 0/0 grow/shrink: 12/131 up/down: 91/-727) Total: -636 bytes
   text    data     bss     dec     hex filename
 773469    1058   11092  785619   bfcd3 busybox_old
 772644    1058   11092  784794   bf99a busybox_unstripped
This commit is contained in:
Denis Vlasenko
2007-08-18 15:32:12 +00:00
parent d6cd9d7fe9
commit fe7cd642b0
143 changed files with 174 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
selinux/chcon.c
View File

@@ -136,7 +136,7 @@ int chcon_main(int argc, char **argv)
":\xff--urtl:u--\xff:r--\xff:t--\xff:l--\xff"
#endif
":f--v:v--f"; /* 'verbose' and 'quiet' are exclusive */
getopt32(argc, argv, "Rchf:u:r:t:l:v",
getopt32(argv, "Rchf:u:r:t:l:v",
&user, &role, &type, &range, &reference_file);
argv += optind;

2
selinux/getsebool.c
View File

@@ -16,7 +16,7 @@ int getsebool_main(int argc, char **argv)
unsigned opt;
selinux_or_die();
opt = getopt32(argc, argv, "a");
opt = getopt32(argv, "a");
if (opt) { /* -a */
if (argc > 2)

2
selinux/matchpathcon.c
View File

@@ -38,7 +38,7 @@ int matchpathcon_main(int argc, char **argv)
opt_complementary = "-1" /* at least one param reqd */
":?:f--p:p--f"; /* mutually exclusive */
opts = getopt32(argc, argv, "nNf:p:V", &fcontext, &prefix);
opts = getopt32(argv, "nNf:p:V", &fcontext, &prefix);
argv += optind;
if (opts & OPT_NOT_TRANS) {

2
selinux/runcon.c
View File

@@ -104,7 +104,7 @@ int runcon_main(int argc, char **argv)
applet_long_options = runcon_longopts;
#endif
opt_complementary = "-1";
opts = getopt32(argc, argv, "r:t:u:l:ch", &role, &type, &user, &range);
opts = getopt32(argv, "r:t:u:l:ch", &role, &type, &user, &range);
argv += optind;
if (!(opts & OPTS_CONTEXT_COMPONENT)) {

4
selinux/setfiles.c
View File

@@ -537,10 +537,10 @@ int setfiles_main(int argc, char **argv)
opt_complementary = "e::vv:v--p:p--v:v--q:q--v";
/* Option order must match OPT_x definitions! */
if (applet_name[0] == 'r') { /* restorecon */
flags = getopt32(argc, argv, "de:f:ilnpqrsvo:FWR",
flags = getopt32(argv, "de:f:ilnpqrsvo:FWR",
&exclude_dir, &input_filename, &out_filename, &verbose);
} else { /* setfiles */
flags = getopt32(argc, argv, "de:f:ilnpqr:svo:FW"
flags = getopt32(argv, "de:f:ilnpqr:svo:FW"
USE_FEATURE_SETFILES_CHECK_OPTION("c:"),
&exclude_dir, &input_filename, &rootpath, &out_filename,
USE_FEATURE_SETFILES_CHECK_OPTION(&policyfile,)