emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libiproute: rename invarg(a,b) to invarg_1_to_2(a,b)

Browse Source 
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>
This commit is contained in:
Denys Vlasenko
2015-10-14 13:21:01 +02:00
parent 69934701fd
commit 0f296a3a56
16 changed files with 62 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
networking/libiproute/utils.c
View File

@ -47,7 +47,7 @@ unsigned get_unsigned(char *arg, const char *errmsg)
return res;
}
}
invarg(arg, errmsg); /* does not return */
invarg_1_to_2(arg, errmsg); /* does not return */
}
uint32_t get_u32(char *arg, const char *errmsg)
@ -62,7 +62,7 @@ uint32_t get_u32(char *arg, const char *errmsg)
return res;
}
}
invarg(arg, errmsg); /* does not return */
invarg_1_to_2(arg, errmsg); /* does not return */
}
uint16_t get_u16(char *arg, const char *errmsg)
@ -77,7 +77,7 @@ uint16_t get_u16(char *arg, const char *errmsg)
return res;
}
}
invarg(arg, errmsg); /* does not return */
invarg_1_to_2(arg, errmsg); /* does not return */
}
int get_addr_1(inet_prefix *addr, char *name, int family)
@ -230,12 +230,12 @@ uint32_t get_addr32(char *name)
void incomplete_command(void)
{
bb_error_msg_and_die("command line is not complete, try option \"help\"");
bb_error_msg_and_die("command line is not complete, try \"help\"");
}
void invarg(const char *arg, const char *opt)
void invarg_1_to_2(const char *arg, const char *opt)
{
bb_error_msg_and_die(bb_msg_invalid_arg, arg, opt);
bb_error_msg_and_die(bb_msg_invalid_arg_to, arg, opt);
}
void duparg(const char *key, const char *arg)