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 /coreutils | |
parent | 69934701fd1b18327b3a779cb292a728834b2d0d (diff) | |
download | busybox-w32-0f296a3a56b52842057e5a2bc653621a3a6c7bec.tar.gz busybox-w32-0f296a3a56b52842057e5a2bc653621a3a6c7bec.tar.bz2 busybox-w32-0f296a3a56b52842057e5a2bc653621a3a6c7bec.zip |
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 'coreutils')
-rw-r--r-- | coreutils/dd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/coreutils/dd.c b/coreutils/dd.c index 53a843ca0..6a5288da1 100644 --- a/coreutils/dd.c +++ b/coreutils/dd.c | |||
@@ -326,7 +326,7 @@ int dd_main(int argc UNUSED_PARAM, char **argv) | |||
326 | *arg = '\0'; | 326 | *arg = '\0'; |
327 | n = index_in_strings(conv_words, val); | 327 | n = index_in_strings(conv_words, val); |
328 | if (n < 0) | 328 | if (n < 0) |
329 | bb_error_msg_and_die(bb_msg_invalid_arg, val, "conv"); | 329 | bb_error_msg_and_die(bb_msg_invalid_arg_to, val, "conv"); |
330 | G.flags |= (1 << n); | 330 | G.flags |= (1 << n); |
331 | if (!arg) /* no ',' left, so this was the last specifier */ | 331 | if (!arg) /* no ',' left, so this was the last specifier */ |
332 | break; | 332 | break; |
@@ -368,7 +368,7 @@ int dd_main(int argc UNUSED_PARAM, char **argv) | |||
368 | int n; | 368 | int n; |
369 | n = index_in_strings(status_words, val); | 369 | n = index_in_strings(status_words, val); |
370 | if (n < 0) | 370 | if (n < 0) |
371 | bb_error_msg_and_die(bb_msg_invalid_arg, val, "status"); | 371 | bb_error_msg_and_die(bb_msg_invalid_arg_to, val, "status"); |
372 | G.flags |= FLAG_STATUS << n; | 372 | G.flags |= FLAG_STATUS << n; |
373 | /*continue;*/ | 373 | /*continue;*/ |
374 | } | 374 | } |