aboutsummaryrefslogtreecommitdiff
path: root/miscutils
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2010-01-04 14:15:38 +0100
committerDenys Vlasenko <vda.linux@googlemail.com>2010-01-04 14:15:38 +0100
commit2ec91aead52d6ea6a42420005119ebb281a76cdc (patch)
tree115804c56ff172f96c0138bcabcc7d5e56e5dae0 /miscutils
parenta355da07756e529c112249653ed5af0e2d910728 (diff)
downloadbusybox-w32-2ec91aead52d6ea6a42420005119ebb281a76cdc.tar.gz
busybox-w32-2ec91aead52d6ea6a42420005119ebb281a76cdc.tar.bz2
busybox-w32-2ec91aead52d6ea6a42420005119ebb281a76cdc.zip
*: remove some uses of argc
function old new delta whoami_main 34 37 +3 logname_main 60 63 +3 hostid_main 35 38 +3 ttysize_main 136 135 -1 nmeter_main 673 672 -1 logger_main 387 386 -1 uuencode_main 330 328 -2 ifupdown_main 2125 2123 -2 mesg_main 158 155 -3 free_main 333 330 -3 cal_main 902 899 -3 acpid_main 443 440 -3 ar_main 196 189 -7 find_main 476 467 -9 ifconfig_main 1235 1221 -14 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 3/12 up/down: 9/-49) Total: -40 bytes Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'miscutils')
-rw-r--r--miscutils/last.c4
-rw-r--r--miscutils/readahead.c6
-rw-r--r--miscutils/ttysize.c4
3 files changed, 8 insertions, 6 deletions
diff --git a/miscutils/last.c b/miscutils/last.c
index f8c301395..6e3ed9093 100644
--- a/miscutils/last.c
+++ b/miscutils/last.c
@@ -35,7 +35,7 @@
35#endif 35#endif
36 36
37int last_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; 37int last_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
38int last_main(int argc, char **argv UNUSED_PARAM) 38int last_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
39{ 39{
40 struct utmp ut; 40 struct utmp ut;
41 int n, file = STDIN_FILENO; 41 int n, file = STDIN_FILENO;
@@ -56,7 +56,7 @@ int last_main(int argc, char **argv UNUSED_PARAM)
56 TYPE_OLD_TIME /* OLD_TIME, 4 */ 56 TYPE_OLD_TIME /* OLD_TIME, 4 */
57 }; 57 };
58 58
59 if (argc > 1) { 59 if (argv[1]) {
60 bb_show_usage(); 60 bb_show_usage();
61 } 61 }
62 file = xopen(bb_path_wtmp_file, O_RDONLY); 62 file = xopen(bb_path_wtmp_file, O_RDONLY);
diff --git a/miscutils/readahead.c b/miscutils/readahead.c
index fb71ce85f..f3b21a2fc 100644
--- a/miscutils/readahead.c
+++ b/miscutils/readahead.c
@@ -13,11 +13,13 @@
13#include "libbb.h" 13#include "libbb.h"
14 14
15int readahead_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; 15int readahead_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
16int readahead_main(int argc, char **argv) 16int readahead_main(int argc UNUSED_PARAM, char **argv)
17{ 17{
18 int retval = EXIT_SUCCESS; 18 int retval = EXIT_SUCCESS;
19 19
20 if (argc == 1) bb_show_usage(); 20 if (!argv[1]) {
21 bb_show_usage();
22 }
21 23
22 while (*++argv) { 24 while (*++argv) {
23 int fd = open_or_warn(*argv, O_RDONLY); 25 int fd = open_or_warn(*argv, O_RDONLY);
diff --git a/miscutils/ttysize.c b/miscutils/ttysize.c
index 05455543d..ca9a2ec8d 100644
--- a/miscutils/ttysize.c
+++ b/miscutils/ttysize.c
@@ -12,7 +12,7 @@
12#include "libbb.h" 12#include "libbb.h"
13 13
14int ttysize_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; 14int ttysize_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
15int ttysize_main(int argc, char **argv) 15int ttysize_main(int argc UNUSED_PARAM, char **argv)
16{ 16{
17 unsigned w, h; 17 unsigned w, h;
18 struct winsize wsz; 18 struct winsize wsz;
@@ -24,7 +24,7 @@ int ttysize_main(int argc, char **argv)
24 h = wsz.ws_row; 24 h = wsz.ws_row;
25 } 25 }
26 26
27 if (argc == 1) { 27 if (!argv[1]) {
28 printf("%u %u", w, h); 28 printf("%u %u", w, h);
29 } else { 29 } else {
30 const char *fmt, *arg; 30 const char *fmt, *arg;