aboutsummaryrefslogtreecommitdiff
path: root/procps
diff options
context:
space:
mode:
authorGravatar Denis Vlasenko <vda.linux@googlemail.com>2007-08-18 15:32:12 +0000
committerGravatar Denis Vlasenko <vda.linux@googlemail.com>2007-08-18 15:32:12 +0000
commitfe7cd642b0b732f5d41403c2f6983ad676b69dd9 (patch)
treee5962885cb72c976f44b178a350a92ba5f1aa02d /procps
parentd6cd9d7fe9eab19a9e36fdda729c78c40205b1e5 (diff)
downloadbusybox-fe7cd642b0b732f5d41403c2f6983ad676b69dd9.tar.gz
busybox-fe7cd642b0b732f5d41403c2f6983ad676b69dd9.tar.bz2
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 'procps')
-rw-r--r--procps/pidof.c2
-rw-r--r--procps/ps.c6
-rw-r--r--procps/top.c2
-rw-r--r--procps/watch.c2
4 files changed, 6 insertions, 6 deletions
diff --git a/procps/pidof.c b/procps/pidof.c
index 01e587cbf..c989076bb 100644
--- a/procps/pidof.c
+++ b/procps/pidof.c
@@ -28,7 +28,7 @@ int pidof_main(int argc, char **argv)
#endif
/* do unconditional option parsing */
- opt = getopt32(argc, argv, ""
+ opt = getopt32(argv, ""
USE_FEATURE_PIDOF_SINGLE ("s")
USE_FEATURE_PIDOF_OMIT("o:", &omits));
diff --git a/procps/ps.c b/procps/ps.c
index 5150a08a2..805fe0615 100644
--- a/procps/ps.c
+++ b/procps/ps.c
@@ -297,7 +297,7 @@ int ps_main(int argc, char **argv)
// Select which columns to display
/* We allow (and ignore) most of the above. FIXME */
opt_complementary = "o::";
- USE_SELINUX(opt =) getopt32(argc, argv, "Zo:aAdefl", &opt_o);
+ USE_SELINUX(opt =) getopt32(argv, "Zo:aAdefl", &opt_o);
if (opt_o) {
do {
parse_o(opt_o->data);
@@ -357,7 +357,7 @@ int ps_main(int argc, char **argv)
#if ENABLE_FEATURE_PS_WIDE || ENABLE_SELINUX
#if ENABLE_FEATURE_PS_WIDE
opt_complementary = "-:ww";
- USE_SELINUX(i =) getopt32(argc, argv, USE_SELINUX("Z") "w", &w_count);
+ USE_SELINUX(i =) getopt32(argv, USE_SELINUX("Z") "w", &w_count);
/* if w is given once, GNU ps sets the width to 132,
* if w is given more than once, it is "unlimited"
*/
@@ -370,7 +370,7 @@ int ps_main(int argc, char **argv)
terminal_width = MAX_WIDTH;
}
#else /* only ENABLE_SELINUX */
- i = getopt32(argc, argv, "Z");
+ i = getopt32(argv, "Z");
#endif
#if ENABLE_SELINUX
if ((i & 1) && is_selinux_enabled())
diff --git a/procps/top.c b/procps/top.c
index 85699b027..494509c7c 100644
--- a/procps/top.c
+++ b/procps/top.c
@@ -535,7 +535,7 @@ int top_main(int argc, char **argv)
/* do normal option parsing */
opt_complementary = "-";
- getopt32(argc, argv, "d:n:b", &sinterval, &siterations);
+ getopt32(argv, "d:n:b", &sinterval, &siterations);
if (option_mask32 & 0x1) interval = xatou(sinterval); // -d
if (option_mask32 & 0x2) iterations = xatou(siterations); // -n
//if (option_mask32 & 0x4) // -b
diff --git a/procps/watch.c b/procps/watch.c
index b2adcd5ce..3d18105bf 100644
--- a/procps/watch.c
+++ b/procps/watch.c
@@ -35,7 +35,7 @@ int watch_main(int argc, char **argv)
char **p;
opt_complementary = "-1"; // at least one param please
- opt = getopt32(argc, argv, "+dtn:", &tmp);
+ opt = getopt32(argv, "+dtn:", &tmp);
//if (opt & 0x1) // -d (ignore)
//if (opt & 0x2) // -t
if (opt & 0x4) period = xatou(tmp);