libiproute: audit callgraph, shortcut error paths into die() functions.

Kill a few statics, made other globals smaller:
oneline is smallint, _SL_ is char

function                                             old     new   delta
print_tunnel                                         693     731     +38
print_route                                         1775    1777      +2
print_addrinfo                                      1495    1497      +2
ipaddr_list_or_flush                                2826    2828      +2
oneline                                                4       1      -3
_SL_                                                   4       1      -3
ipaddr_modify                                       1476    1472      -4
parse_address                                        124     119      -5
ip_parse_common_args                                 429     423      -6
on_off                                                53      46      -7
do_del_ioctl                                         113     106      -7
do_add_ioctl                                         120     113      -7
do_show                                              864     856      -8
iprule_list                                          157     148      -9
do_iptunnel                                          310     299     -11
do_add                                               143     126     -17
get_ctl_fd                                            95      76     -19
set_address                                          108      84     -24
ip_main                                              351     323     -28
static.ifr                                            32       -     -32
parse_args                                          1992    1949     -43
iproute_list_or_flush                               1673    1582     -91
do_iplink                                           1583    1485     -98
filter                                               280       -    -280
------------------------------------------------------------------------------
(add/remove: 0/2 grow/shrink: 4/18 up/down: 44/-702)         Total: -658 bytes
This commit is contained in:
Denis Vlasenko
2007-04-07 01:14:45 +00:00
parent fbd2918f5c
commit 540a2a1f3b
11 changed files with 247 additions and 319 deletions

View File

@ -54,7 +54,7 @@ int ll_remember_index(struct sockaddr_nl *who, struct nlmsghdr *n, void *arg)
h = ifi->ifi_index&0xF;
for (imp=&idxmap[h]; (im=*imp)!=NULL; imp = &im->next)
for (imp = &idxmap[h]; (im = *imp) != NULL; imp = &im->next)
if (im->index == ifi->ifi_index)
break;
@ -87,7 +87,7 @@ const char *ll_idx_n2a(int idx, char *buf)
if (idx == 0)
return "*";
for (im = idxmap[idx&0xF]; im; im = im->next)
for (im = idxmap[idx & 0xF]; im; im = im->next)
if (im->index == idx)
return im->name;
snprintf(buf, 16, "if%d", idx);
@ -108,7 +108,7 @@ int ll_index_to_type(int idx)
if (idx == 0)
return -1;
for (im = idxmap[idx&0xF]; im; im = im->next)
for (im = idxmap[idx & 0xF]; im; im = im->next)
if (im->index == idx)
return im->type;
return -1;
@ -121,16 +121,18 @@ unsigned ll_index_to_flags(int idx)
if (idx == 0)
return 0;
for (im = idxmap[idx&0xF]; im; im = im->next)
for (im = idxmap[idx & 0xF]; im; im = im->next)
if (im->index == idx)
return im->flags;
return 0;
}
// TODO: caching is not warranted - no users which repeatedly call it
int ll_name_to_index(char *name)
{
static char ncache[16];
static int icache;
struct idxmap *im;
int sock_fd;
int i;
@ -139,7 +141,7 @@ int ll_name_to_index(char *name)
return 0;
if (icache && strcmp(name, ncache) == 0)
return icache;
for (i=0; i<16; i++) {
for (i = 0; i < 16; i++) {
for (im = idxmap[i]; im; im = im->next) {
if (strcmp(im->name, name) == 0) {
icache = im->index;