diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2015-10-14 13:21:01 +0200 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2015-10-14 13:21:01 +0200 |
| commit | 0f296a3a56b52842057e5a2bc653621a3a6c7bec (patch) | |
| tree | c504475cbf18d845698097e6b3b9656e0040d373 /networking/brctl.c | |
| parent | 69934701fd1b18327b3a779cb292a728834b2d0d (diff) | |
| download | busybox-0f296a3a56b52842057e5a2bc653621a3a6c7bec.tar.gz | |
libiproute: rename invarg(a,b) to invarg_1_to_2(a,b)
invarg(a,b) - "invalid argument", but how a and b enter the message?
invarg_1_to_2(a,b) is somewhat easier to read: "invalid argument 'a' to 'b'"
Audit of usage revealed a number of bad uses, with too long messages.
text data bss dec hex filename
938848 932 17448 957228 e9b2c busybox_old
938788 932 17448 957168 e9af0 busybox_unstripped
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'networking/brctl.c')
| -rw-r--r-- | networking/brctl.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/networking/brctl.c b/networking/brctl.c index c01a86998..b7320966a 100644 --- a/networking/brctl.c +++ b/networking/brctl.c @@ -128,7 +128,7 @@ static ALWAYS_INLINE void bb_strtotimeval(struct timeval *tv, # else if (sscanf(time_str, "%lf", &secs) != 1) # endif - bb_error_msg_and_die(bb_msg_invalid_arg, time_str, "timespec"); + bb_error_msg_and_die(bb_msg_invalid_arg_to, time_str, "timespec"); tv->tv_sec = secs; tv->tv_usec = 1000000 * (secs - tv->tv_sec); } @@ -205,7 +205,7 @@ int brctl_main(int argc UNUSED_PARAM, char **argv) key = index_in_strings(keywords, *argv); if (key == -1) /* no match found in keywords array, bail out. */ - bb_error_msg_and_die(bb_msg_invalid_arg, *argv, applet_name); + bb_error_msg_and_die(bb_msg_invalid_arg_to, *argv, applet_name); argv++; fd = xsocket(AF_INET, SOCK_STREAM, 0); @@ -299,7 +299,7 @@ int brctl_main(int argc UNUSED_PARAM, char **argv) "1\0" "on\0" "y\0" "yes\0"; /* 4 .. 7 */ int onoff = index_in_strings(no_yes, *argv); if (onoff < 0) - bb_error_msg_and_die(bb_msg_invalid_arg, *argv, applet_name); + bb_error_msg_and_die(bb_msg_invalid_arg_to, *argv, applet_name); onoff = (unsigned)onoff / 4; arm_ioctl(args, BRCTL_SET_BRIDGE_STP_STATE, onoff, 0); goto fire; @@ -332,7 +332,7 @@ int brctl_main(int argc UNUSED_PARAM, char **argv) port = if_nametoindex(*argv++); if (!port) - bb_error_msg_and_die(bb_msg_invalid_arg, *argv, "port"); + bb_error_msg_and_die(bb_msg_invalid_arg_to, *argv, "port"); memset(ifidx, 0, sizeof ifidx); arm_ioctl(args, BRCTL_GET_PORT_LIST, (unsigned long)ifidx, MAX_PORTS); |