aboutsummaryrefslogtreecommitdiff
path: root/networking/libiproute/ll_map.c
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2007-04-07 01:14:45 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2007-04-07 01:14:45 +0000
commit540a2a1f3b056ddaea72f84c5a9b7ec947d75c8e (patch)
tree1d5e5c26d7bcffe29d58d50305ca1e2408f1985a /networking/libiproute/ll_map.c
parentfbd2918f5c91723063ed698026217a77a0fe565b (diff)
downloadbusybox-w32-540a2a1f3b056ddaea72f84c5a9b7ec947d75c8e.tar.gz
busybox-w32-540a2a1f3b056ddaea72f84c5a9b7ec947d75c8e.tar.bz2
busybox-w32-540a2a1f3b056ddaea72f84c5a9b7ec947d75c8e.zip
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
Diffstat (limited to 'networking/libiproute/ll_map.c')
-rw-r--r--networking/libiproute/ll_map.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/networking/libiproute/ll_map.c b/networking/libiproute/ll_map.c
index f429763eb..a8fcd7f88 100644
--- a/networking/libiproute/ll_map.c
+++ b/networking/libiproute/ll_map.c
@@ -54,7 +54,7 @@ int ll_remember_index(struct sockaddr_nl *who, struct nlmsghdr *n, void *arg)
54 54
55 h = ifi->ifi_index&0xF; 55 h = ifi->ifi_index&0xF;
56 56
57 for (imp=&idxmap[h]; (im=*imp)!=NULL; imp = &im->next) 57 for (imp = &idxmap[h]; (im = *imp) != NULL; imp = &im->next)
58 if (im->index == ifi->ifi_index) 58 if (im->index == ifi->ifi_index)
59 break; 59 break;
60 60
@@ -87,7 +87,7 @@ const char *ll_idx_n2a(int idx, char *buf)
87 87
88 if (idx == 0) 88 if (idx == 0)
89 return "*"; 89 return "*";
90 for (im = idxmap[idx&0xF]; im; im = im->next) 90 for (im = idxmap[idx & 0xF]; im; im = im->next)
91 if (im->index == idx) 91 if (im->index == idx)
92 return im->name; 92 return im->name;
93 snprintf(buf, 16, "if%d", idx); 93 snprintf(buf, 16, "if%d", idx);
@@ -108,7 +108,7 @@ int ll_index_to_type(int idx)
108 108
109 if (idx == 0) 109 if (idx == 0)
110 return -1; 110 return -1;
111 for (im = idxmap[idx&0xF]; im; im = im->next) 111 for (im = idxmap[idx & 0xF]; im; im = im->next)
112 if (im->index == idx) 112 if (im->index == idx)
113 return im->type; 113 return im->type;
114 return -1; 114 return -1;
@@ -121,16 +121,18 @@ unsigned ll_index_to_flags(int idx)
121 if (idx == 0) 121 if (idx == 0)
122 return 0; 122 return 0;
123 123
124 for (im = idxmap[idx&0xF]; im; im = im->next) 124 for (im = idxmap[idx & 0xF]; im; im = im->next)
125 if (im->index == idx) 125 if (im->index == idx)
126 return im->flags; 126 return im->flags;
127 return 0; 127 return 0;
128} 128}
129 129
130// TODO: caching is not warranted - no users which repeatedly call it
130int ll_name_to_index(char *name) 131int ll_name_to_index(char *name)
131{ 132{
132 static char ncache[16]; 133 static char ncache[16];
133 static int icache; 134 static int icache;
135
134 struct idxmap *im; 136 struct idxmap *im;
135 int sock_fd; 137 int sock_fd;
136 int i; 138 int i;
@@ -139,7 +141,7 @@ int ll_name_to_index(char *name)
139 return 0; 141 return 0;
140 if (icache && strcmp(name, ncache) == 0) 142 if (icache && strcmp(name, ncache) == 0)
141 return icache; 143 return icache;
142 for (i=0; i<16; i++) { 144 for (i = 0; i < 16; i++) {
143 for (im = idxmap[i]; im; im = im->next) { 145 for (im = idxmap[i]; im; im = im->next) {
144 if (strcmp(im->name, name) == 0) { 146 if (strcmp(im->name, name) == 0) {
145 icache = im->index; 147 icache = im->index;