diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2007-08-18 15:32:12 +0000 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2007-08-18 15:32:12 +0000 |
commit | fe7cd642b0b732f5d41403c2f6983ad676b69dd9 (patch) | |
tree | e5962885cb72c976f44b178a350a92ba5f1aa02d /selinux | |
parent | d6cd9d7fe9eab19a9e36fdda729c78c40205b1e5 (diff) | |
download | busybox-w32-fe7cd642b0b732f5d41403c2f6983ad676b69dd9.tar.gz busybox-w32-fe7cd642b0b732f5d41403c2f6983ad676b69dd9.tar.bz2 busybox-w32-fe7cd642b0b732f5d41403c2f6983ad676b69dd9.zip |
don't pass argc in getopt32, it's superfluous
(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
Diffstat (limited to 'selinux')
-rw-r--r-- | selinux/chcon.c | 2 | ||||
-rw-r--r-- | selinux/getsebool.c | 2 | ||||
-rw-r--r-- | selinux/matchpathcon.c | 2 | ||||
-rw-r--r-- | selinux/runcon.c | 2 | ||||
-rw-r--r-- | selinux/setfiles.c | 4 |
5 files changed, 6 insertions, 6 deletions
diff --git a/selinux/chcon.c b/selinux/chcon.c index a9552281d..f0590b5b0 100644 --- a/selinux/chcon.c +++ b/selinux/chcon.c | |||
@@ -136,7 +136,7 @@ int chcon_main(int argc, char **argv) | |||
136 | ":\xff--urtl:u--\xff:r--\xff:t--\xff:l--\xff" | 136 | ":\xff--urtl:u--\xff:r--\xff:t--\xff:l--\xff" |
137 | #endif | 137 | #endif |
138 | ":f--v:v--f"; /* 'verbose' and 'quiet' are exclusive */ | 138 | ":f--v:v--f"; /* 'verbose' and 'quiet' are exclusive */ |
139 | getopt32(argc, argv, "Rchf:u:r:t:l:v", | 139 | getopt32(argv, "Rchf:u:r:t:l:v", |
140 | &user, &role, &type, &range, &reference_file); | 140 | &user, &role, &type, &range, &reference_file); |
141 | argv += optind; | 141 | argv += optind; |
142 | 142 | ||
diff --git a/selinux/getsebool.c b/selinux/getsebool.c index b059003c1..06a298061 100644 --- a/selinux/getsebool.c +++ b/selinux/getsebool.c | |||
@@ -16,7 +16,7 @@ int getsebool_main(int argc, char **argv) | |||
16 | unsigned opt; | 16 | unsigned opt; |
17 | 17 | ||
18 | selinux_or_die(); | 18 | selinux_or_die(); |
19 | opt = getopt32(argc, argv, "a"); | 19 | opt = getopt32(argv, "a"); |
20 | 20 | ||
21 | if (opt) { /* -a */ | 21 | if (opt) { /* -a */ |
22 | if (argc > 2) | 22 | if (argc > 2) |
diff --git a/selinux/matchpathcon.c b/selinux/matchpathcon.c index 8d681d02f..2bc0a3304 100644 --- a/selinux/matchpathcon.c +++ b/selinux/matchpathcon.c | |||
@@ -38,7 +38,7 @@ int matchpathcon_main(int argc, char **argv) | |||
38 | 38 | ||
39 | opt_complementary = "-1" /* at least one param reqd */ | 39 | opt_complementary = "-1" /* at least one param reqd */ |
40 | ":?:f--p:p--f"; /* mutually exclusive */ | 40 | ":?:f--p:p--f"; /* mutually exclusive */ |
41 | opts = getopt32(argc, argv, "nNf:p:V", &fcontext, &prefix); | 41 | opts = getopt32(argv, "nNf:p:V", &fcontext, &prefix); |
42 | argv += optind; | 42 | argv += optind; |
43 | 43 | ||
44 | if (opts & OPT_NOT_TRANS) { | 44 | if (opts & OPT_NOT_TRANS) { |
diff --git a/selinux/runcon.c b/selinux/runcon.c index 015a23322..37ac5d18f 100644 --- a/selinux/runcon.c +++ b/selinux/runcon.c | |||
@@ -104,7 +104,7 @@ int runcon_main(int argc, char **argv) | |||
104 | applet_long_options = runcon_longopts; | 104 | applet_long_options = runcon_longopts; |
105 | #endif | 105 | #endif |
106 | opt_complementary = "-1"; | 106 | opt_complementary = "-1"; |
107 | opts = getopt32(argc, argv, "r:t:u:l:ch", &role, &type, &user, &range); | 107 | opts = getopt32(argv, "r:t:u:l:ch", &role, &type, &user, &range); |
108 | argv += optind; | 108 | argv += optind; |
109 | 109 | ||
110 | if (!(opts & OPTS_CONTEXT_COMPONENT)) { | 110 | if (!(opts & OPTS_CONTEXT_COMPONENT)) { |
diff --git a/selinux/setfiles.c b/selinux/setfiles.c index 08b911a03..174d4ce60 100644 --- a/selinux/setfiles.c +++ b/selinux/setfiles.c | |||
@@ -537,10 +537,10 @@ int setfiles_main(int argc, char **argv) | |||
537 | opt_complementary = "e::vv:v--p:p--v:v--q:q--v"; | 537 | opt_complementary = "e::vv:v--p:p--v:v--q:q--v"; |
538 | /* Option order must match OPT_x definitions! */ | 538 | /* Option order must match OPT_x definitions! */ |
539 | if (applet_name[0] == 'r') { /* restorecon */ | 539 | if (applet_name[0] == 'r') { /* restorecon */ |
540 | flags = getopt32(argc, argv, "de:f:ilnpqrsvo:FWR", | 540 | flags = getopt32(argv, "de:f:ilnpqrsvo:FWR", |
541 | &exclude_dir, &input_filename, &out_filename, &verbose); | 541 | &exclude_dir, &input_filename, &out_filename, &verbose); |
542 | } else { /* setfiles */ | 542 | } else { /* setfiles */ |
543 | flags = getopt32(argc, argv, "de:f:ilnpqr:svo:FW" | 543 | flags = getopt32(argv, "de:f:ilnpqr:svo:FW" |
544 | USE_FEATURE_SETFILES_CHECK_OPTION("c:"), | 544 | USE_FEATURE_SETFILES_CHECK_OPTION("c:"), |
545 | &exclude_dir, &input_filename, &rootpath, &out_filename, | 545 | &exclude_dir, &input_filename, &rootpath, &out_filename, |
546 | USE_FEATURE_SETFILES_CHECK_OPTION(&policyfile,) | 546 | USE_FEATURE_SETFILES_CHECK_OPTION(&policyfile,) |