aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2010-01-04 13:16:08 +0100
committerDenys Vlasenko <vda.linux@googlemail.com>2010-01-04 13:16:08 +0100
commita355da07756e529c112249653ed5af0e2d910728 (patch)
tree3b36dd1ec8618a39c8324bcfdca77f6f8f497a18
parenta4899efd03d2fdaaf3f581d89a7a4844832d3fbb (diff)
downloadbusybox-w32-a355da07756e529c112249653ed5af0e2d910728.tar.gz
busybox-w32-a355da07756e529c112249653ed5af0e2d910728.tar.bz2
busybox-w32-a355da07756e529c112249653ed5af0e2d910728.zip
*: make 2 more "int argc"'s unused; more saved if !DESKTOP
function old new delta sync_main 18 20 +2 tty_main 90 87 -3 iprule_list 83 79 -4 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--console-tools/dumpkmap.c4
-rw-r--r--console-tools/loadkmap.c4
-rw-r--r--coreutils/sync.c4
-rw-r--r--coreutils/tty.c8
-rw-r--r--include/libbb.h6
-rw-r--r--libbb/warn_ignoring_args.c7
-rw-r--r--networking/libiproute/iprule.c2
7 files changed, 20 insertions, 15 deletions
diff --git a/console-tools/dumpkmap.c b/console-tools/dumpkmap.c
index c382b5af9..061fc4792 100644
--- a/console-tools/dumpkmap.c
+++ b/console-tools/dumpkmap.c
@@ -28,9 +28,9 @@ int dumpkmap_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
28{ 28{
29 struct kbentry ke; 29 struct kbentry ke;
30 int i, j, fd; 30 int i, j, fd;
31 RESERVE_CONFIG_BUFFER(flags,MAX_NR_KEYMAPS); 31 RESERVE_CONFIG_BUFFER(flags, MAX_NR_KEYMAPS);
32 32
33/* bb_warn_ignoring_args(argc>=2);*/ 33/* bb_warn_ignoring_args(argv[1]);*/
34 34
35 fd = get_console_fd_or_die(); 35 fd = get_console_fd_or_die();
36 36
diff --git a/console-tools/loadkmap.c b/console-tools/loadkmap.c
index a6b9a86aa..912291a7d 100644
--- a/console-tools/loadkmap.c
+++ b/console-tools/loadkmap.c
@@ -30,9 +30,9 @@ int loadkmap_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
30 int i, j, fd; 30 int i, j, fd;
31 uint16_t ibuff[NR_KEYS]; 31 uint16_t ibuff[NR_KEYS];
32/* const char *tty_name = CURRENT_TTY; */ 32/* const char *tty_name = CURRENT_TTY; */
33 RESERVE_CONFIG_BUFFER(flags,MAX_NR_KEYMAPS); 33 RESERVE_CONFIG_BUFFER(flags, MAX_NR_KEYMAPS);
34 34
35/* bb_warn_ignoring_args(argc >= 2); */ 35/* bb_warn_ignoring_args(argv[1]); */
36 fd = get_console_fd_or_die(); 36 fd = get_console_fd_or_die();
37/* or maybe: 37/* or maybe:
38 opt = getopt32(argv, "C:", &tty_name); 38 opt = getopt32(argv, "C:", &tty_name);
diff --git a/coreutils/sync.c b/coreutils/sync.c
index f00a3d075..9016655e0 100644
--- a/coreutils/sync.c
+++ b/coreutils/sync.c
@@ -14,10 +14,10 @@
14/* This is a NOFORK applet. Be very careful! */ 14/* This is a NOFORK applet. Be very careful! */
15 15
16int sync_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; 16int sync_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
17int sync_main(int argc, char **argv UNUSED_PARAM) 17int sync_main(int argc UNUSED_PARAM, char **argv)
18{ 18{
19 /* coreutils-6.9 compat */ 19 /* coreutils-6.9 compat */
20 bb_warn_ignoring_args(argc - 1); 20 bb_warn_ignoring_args(argv[1]);
21 21
22 sync(); 22 sync();
23 23
diff --git a/coreutils/tty.c b/coreutils/tty.c
index 975ccdfaa..69352ecf8 100644
--- a/coreutils/tty.c
+++ b/coreutils/tty.c
@@ -13,7 +13,7 @@
13#include "libbb.h" 13#include "libbb.h"
14 14
15int tty_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; 15int tty_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
16int tty_main(int argc, char **argv IF_NOT_INCLUDE_SUSv2(UNUSED_PARAM)) 16int tty_main(int argc UNUSED_PARAM, char **argv)
17{ 17{
18 const char *s; 18 const char *s;
19 IF_INCLUDE_SUSv2(int silent;) /* Note: No longer relevant in SUSv3. */ 19 IF_INCLUDE_SUSv2(int silent;) /* Note: No longer relevant in SUSv3. */
@@ -22,11 +22,11 @@ int tty_main(int argc, char **argv IF_NOT_INCLUDE_SUSv2(UNUSED_PARAM))
22 xfunc_error_retval = 2; /* SUSv3 requires > 1 for error. */ 22 xfunc_error_retval = 2; /* SUSv3 requires > 1 for error. */
23 23
24 IF_INCLUDE_SUSv2(silent = getopt32(argv, "s");) 24 IF_INCLUDE_SUSv2(silent = getopt32(argv, "s");)
25 IF_INCLUDE_SUSv2(argc -= optind;) 25 IF_INCLUDE_SUSv2(argv += optind;)
26 IF_NOT_INCLUDE_SUSv2(argc -= 1;) 26 IF_NOT_INCLUDE_SUSv2(argv += 1;)
27 27
28 /* gnu tty outputs a warning that it is ignoring all args. */ 28 /* gnu tty outputs a warning that it is ignoring all args. */
29 bb_warn_ignoring_args(argc); 29 bb_warn_ignoring_args(argv[0]);
30 30
31 retval = EXIT_SUCCESS; 31 retval = EXIT_SUCCESS;
32 32
diff --git a/include/libbb.h b/include/libbb.h
index 8d3df6191..cda59dc1f 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -1022,7 +1022,11 @@ extern struct mntent *find_mount_point(const char *name, int subdir_too) FAST_FU
1022extern void erase_mtab(const char * name) FAST_FUNC; 1022extern void erase_mtab(const char * name) FAST_FUNC;
1023extern unsigned int tty_baud_to_value(speed_t speed) FAST_FUNC; 1023extern unsigned int tty_baud_to_value(speed_t speed) FAST_FUNC;
1024extern speed_t tty_value_to_baud(unsigned int value) FAST_FUNC; 1024extern speed_t tty_value_to_baud(unsigned int value) FAST_FUNC;
1025extern void bb_warn_ignoring_args(int n) FAST_FUNC; 1025#if ENABLE_DESKTOP
1026extern void bb_warn_ignoring_args(char *arg) FAST_FUNC;
1027#else
1028# define bb_warn_ignoring_args(arg) ((void)0)
1029#endif
1026 1030
1027extern int get_linux_version_code(void) FAST_FUNC; 1031extern int get_linux_version_code(void) FAST_FUNC;
1028 1032
diff --git a/libbb/warn_ignoring_args.c b/libbb/warn_ignoring_args.c
index 65dea321a..fa33c258f 100644
--- a/libbb/warn_ignoring_args.c
+++ b/libbb/warn_ignoring_args.c
@@ -6,12 +6,13 @@
6 * 6 *
7 * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. 7 * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
8 */ 8 */
9
10#include "libbb.h" 9#include "libbb.h"
11 10
12void FAST_FUNC bb_warn_ignoring_args(int n) 11#if ENABLE_DESKTOP
12void FAST_FUNC bb_warn_ignoring_args(char *arg)
13{ 13{
14 if (n) { 14 if (arg) {
15 bb_error_msg("ignoring all arguments"); 15 bb_error_msg("ignoring all arguments");
16 } 16 }
17} 17}
18#endif
diff --git a/networking/libiproute/iprule.c b/networking/libiproute/iprule.c
index 659f3a9f0..e7674530c 100644
--- a/networking/libiproute/iprule.c
+++ b/networking/libiproute/iprule.c
@@ -166,7 +166,7 @@ static int iprule_list(char **argv)
166 166
167 if (*argv) { 167 if (*argv) {
168 //bb_error_msg("\"rule show\" needs no arguments"); 168 //bb_error_msg("\"rule show\" needs no arguments");
169 bb_warn_ignoring_args(1); 169 bb_warn_ignoring_args(*argv);
170 return -1; 170 return -1;
171 } 171 }
172 172