aboutsummaryrefslogtreecommitdiff
path: root/networking/libiproute
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2009-06-05 12:06:05 +0200
committerDenys Vlasenko <vda.linux@googlemail.com>2009-06-05 12:06:05 +0200
commitd5f1b1bbe0a881f66b6bb6951fa54e553002c24d (patch)
treea3da20d19fa86c77e63c08f01d052b196cb1b192 /networking/libiproute
parent8507e1f10927bc6498cf38eb8324a53bde8e0a61 (diff)
downloadbusybox-w32-d5f1b1bbe0a881f66b6bb6951fa54e553002c24d.tar.gz
busybox-w32-d5f1b1bbe0a881f66b6bb6951fa54e553002c24d.tar.bz2
busybox-w32-d5f1b1bbe0a881f66b6bb6951fa54e553002c24d.zip
*: add FAST_FUNC to function ptrs where it makes sense
function old new delta evalcommand 1195 1209 +14 testcmd - 10 +10 printfcmd - 10 +10 echocmd - 10 +10 func_exec 270 276 +6 echo_dg 104 109 +5 store_nlmsg 85 89 +4 pseudo_exec_argv 195 198 +3 dotcmd 287 290 +3 machtime_stream 29 31 +2 discard_stream 24 26 +2 argstr 1299 1301 +2 killcmd 108 109 +1 evalfor 226 227 +1 daytime_stream 43 44 +1 run_list 2544 2543 -1 lookupvar 62 61 -1 ipaddr_modify 1310 1309 -1 ... parse_stream 2254 2245 -9 evalpipe 356 347 -9 collect_if 210 197 -13 read_opt 869 851 -18 handle_dollar 681 658 -23 print_addrinfo 1342 1303 -39 iterate_on_dir 156 59 -97 print_route 1709 1609 -100 ------------------------------------------------------------------------------ (add/remove: 3/0 grow/shrink: 12/130 up/down: 74/-767) Total: -693 bytes text data bss dec hex filename 841748 467 7872 850087 cf8a7 busybox_old 841061 467 7872 849400 cf5f8 busybox_unstripped Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'networking/libiproute')
-rw-r--r--networking/libiproute/ipaddress.c7
-rw-r--r--networking/libiproute/iproute.c2
-rw-r--r--networking/libiproute/iprule.c2
-rw-r--r--networking/libiproute/libnetlink.c12
-rw-r--r--networking/libiproute/libnetlink.h10
-rw-r--r--networking/libiproute/ll_map.c12
-rw-r--r--networking/libiproute/ll_map.h12
7 files changed, 28 insertions, 29 deletions
diff --git a/networking/libiproute/ipaddress.c b/networking/libiproute/ipaddress.c
index 644874f46..d042af07b 100644
--- a/networking/libiproute/ipaddress.c
+++ b/networking/libiproute/ipaddress.c
@@ -196,7 +196,7 @@ static int flush_update(void)
196 return 0; 196 return 0;
197} 197}
198 198
199static int print_addrinfo(const struct sockaddr_nl *who UNUSED_PARAM, 199static int FAST_FUNC print_addrinfo(const struct sockaddr_nl *who UNUSED_PARAM,
200 struct nlmsghdr *n, void *arg UNUSED_PARAM) 200 struct nlmsghdr *n, void *arg UNUSED_PARAM)
201{ 201{
202 struct ifaddrmsg *ifa = NLMSG_DATA(n); 202 struct ifaddrmsg *ifa = NLMSG_DATA(n);
@@ -349,8 +349,7 @@ static int print_addrinfo(const struct sockaddr_nl *who UNUSED_PARAM,
349} 349}
350 350
351 351
352struct nlmsg_list 352struct nlmsg_list {
353{
354 struct nlmsg_list *next; 353 struct nlmsg_list *next;
355 struct nlmsghdr h; 354 struct nlmsghdr h;
356}; 355};
@@ -377,7 +376,7 @@ static int print_selected_addrinfo(int ifindex, struct nlmsg_list *ainfo)
377} 376}
378 377
379 378
380static int store_nlmsg(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg) 379static int FAST_FUNC store_nlmsg(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg)
381{ 380{
382 struct nlmsg_list **linfo = (struct nlmsg_list**)arg; 381 struct nlmsg_list **linfo = (struct nlmsg_list**)arg;
383 struct nlmsg_list *h; 382 struct nlmsg_list *h;
diff --git a/networking/libiproute/iproute.c b/networking/libiproute/iproute.c
index 37859525d..ac7eec598 100644
--- a/networking/libiproute/iproute.c
+++ b/networking/libiproute/iproute.c
@@ -78,7 +78,7 @@ static unsigned get_hz(void)
78 return hz_internal; 78 return hz_internal;
79} 79}
80 80
81static int print_route(const struct sockaddr_nl *who UNUSED_PARAM, 81static int FAST_FUNC print_route(const struct sockaddr_nl *who UNUSED_PARAM,
82 struct nlmsghdr *n, void *arg UNUSED_PARAM) 82 struct nlmsghdr *n, void *arg UNUSED_PARAM)
83{ 83{
84 struct rtmsg *r = NLMSG_DATA(n); 84 struct rtmsg *r = NLMSG_DATA(n);
diff --git a/networking/libiproute/iprule.c b/networking/libiproute/iprule.c
index 6c90c6d21..bec530dcb 100644
--- a/networking/libiproute/iprule.c
+++ b/networking/libiproute/iprule.c
@@ -40,7 +40,7 @@ static void usage(void)
40} 40}
41*/ 41*/
42 42
43static int print_rule(const struct sockaddr_nl *who UNUSED_PARAM, 43static int FAST_FUNC print_rule(const struct sockaddr_nl *who UNUSED_PARAM,
44 struct nlmsghdr *n, void *arg UNUSED_PARAM) 44 struct nlmsghdr *n, void *arg UNUSED_PARAM)
45{ 45{
46 struct rtmsg *r = NLMSG_DATA(n); 46 struct rtmsg *r = NLMSG_DATA(n);
diff --git a/networking/libiproute/libnetlink.c b/networking/libiproute/libnetlink.c
index 7ad2de9fa..b4cc8dfa4 100644
--- a/networking/libiproute/libnetlink.c
+++ b/networking/libiproute/libnetlink.c
@@ -104,7 +104,7 @@ int FAST_FUNC rtnl_dump_request(struct rtnl_handle *rth, int type, void *req, in
104} 104}
105 105
106static int rtnl_dump_filter(struct rtnl_handle *rth, 106static int rtnl_dump_filter(struct rtnl_handle *rth,
107 int (*filter)(const struct sockaddr_nl *, struct nlmsghdr *n, void *), 107 int (*filter)(const struct sockaddr_nl *, struct nlmsghdr *n, void *) FAST_FUNC,
108 void *arg1/*, 108 void *arg1/*,
109 int (*junk)(struct sockaddr_nl *, struct nlmsghdr *n, void *), 109 int (*junk)(struct sockaddr_nl *, struct nlmsghdr *n, void *),
110 void *arg2*/) 110 void *arg2*/)
@@ -196,7 +196,7 @@ static int rtnl_dump_filter(struct rtnl_handle *rth,
196} 196}
197 197
198int FAST_FUNC xrtnl_dump_filter(struct rtnl_handle *rth, 198int FAST_FUNC xrtnl_dump_filter(struct rtnl_handle *rth,
199 int (*filter)(const struct sockaddr_nl *, struct nlmsghdr *, void *), 199 int (*filter)(const struct sockaddr_nl *, struct nlmsghdr *, void *) FAST_FUNC,
200 void *arg1) 200 void *arg1)
201{ 201{
202 int ret = rtnl_dump_filter(rth, filter, arg1/*, NULL, NULL*/); 202 int ret = rtnl_dump_filter(rth, filter, arg1/*, NULL, NULL*/);
@@ -206,10 +206,10 @@ int FAST_FUNC xrtnl_dump_filter(struct rtnl_handle *rth,
206} 206}
207 207
208int FAST_FUNC rtnl_talk(struct rtnl_handle *rtnl, struct nlmsghdr *n, 208int FAST_FUNC rtnl_talk(struct rtnl_handle *rtnl, struct nlmsghdr *n,
209 pid_t peer, unsigned groups, 209 pid_t peer, unsigned groups,
210 struct nlmsghdr *answer, 210 struct nlmsghdr *answer,
211 int (*junk)(struct sockaddr_nl *, struct nlmsghdr *, void *), 211 int (*junk)(struct sockaddr_nl *, struct nlmsghdr *, void *),
212 void *jarg) 212 void *jarg)
213{ 213{
214/* bbox doesn't use parameters no. 3, 4, 6, 7, they are stubbed out */ 214/* bbox doesn't use parameters no. 3, 4, 6, 7, they are stubbed out */
215#define peer 0 215#define peer 0
diff --git a/networking/libiproute/libnetlink.h b/networking/libiproute/libnetlink.h
index 11a4a100a..41ecfa6d0 100644
--- a/networking/libiproute/libnetlink.h
+++ b/networking/libiproute/libnetlink.h
@@ -23,16 +23,16 @@ extern void rtnl_close(struct rtnl_handle *rth) FAST_FUNC;
23extern int xrtnl_wilddump_request(struct rtnl_handle *rth, int fam, int type) FAST_FUNC; 23extern int xrtnl_wilddump_request(struct rtnl_handle *rth, int fam, int type) FAST_FUNC;
24extern int rtnl_dump_request(struct rtnl_handle *rth, int type, void *req, int len) FAST_FUNC; 24extern int rtnl_dump_request(struct rtnl_handle *rth, int type, void *req, int len) FAST_FUNC;
25extern int xrtnl_dump_filter(struct rtnl_handle *rth, 25extern int xrtnl_dump_filter(struct rtnl_handle *rth,
26 int (*filter)(const struct sockaddr_nl*, struct nlmsghdr *n, void*), 26 int (*filter)(const struct sockaddr_nl*, struct nlmsghdr *n, void*) FAST_FUNC,
27 void *arg1) FAST_FUNC; 27 void *arg1) FAST_FUNC;
28 28
29/* bbox doesn't use parameters no. 3, 4, 6, 7, stub them out */ 29/* bbox doesn't use parameters no. 3, 4, 6, 7, stub them out */
30#define rtnl_talk(rtnl, n, peer, groups, answer, junk, jarg) \ 30#define rtnl_talk(rtnl, n, peer, groups, answer, junk, jarg) \
31 rtnl_talk(rtnl, n, answer) 31 rtnl_talk(rtnl, n, answer)
32extern int rtnl_talk(struct rtnl_handle *rtnl, struct nlmsghdr *n, pid_t peer, 32extern int rtnl_talk(struct rtnl_handle *rtnl, struct nlmsghdr *n, pid_t peer,
33 unsigned groups, struct nlmsghdr *answer, 33 unsigned groups, struct nlmsghdr *answer,
34 int (*junk)(struct sockaddr_nl *,struct nlmsghdr *n, void *), 34 int (*junk)(struct sockaddr_nl *,struct nlmsghdr *n, void *),
35 void *jarg) FAST_FUNC; 35 void *jarg) FAST_FUNC;
36 36
37extern int rtnl_send(struct rtnl_handle *rth, char *buf, int) FAST_FUNC; 37extern int rtnl_send(struct rtnl_handle *rth, char *buf, int) FAST_FUNC;
38 38
diff --git a/networking/libiproute/ll_map.c b/networking/libiproute/ll_map.c
index 951496f4d..62528cc83 100644
--- a/networking/libiproute/ll_map.c
+++ b/networking/libiproute/ll_map.c
@@ -39,7 +39,7 @@ static struct idxmap *find_by_index(int idx)
39 return NULL; 39 return NULL;
40} 40}
41 41
42int ll_remember_index(const struct sockaddr_nl *who UNUSED_PARAM, 42int FAST_FUNC ll_remember_index(const struct sockaddr_nl *who UNUSED_PARAM,
43 struct nlmsghdr *n, 43 struct nlmsghdr *n,
44 void *arg UNUSED_PARAM) 44 void *arg UNUSED_PARAM)
45{ 45{
@@ -86,7 +86,7 @@ int ll_remember_index(const struct sockaddr_nl *who UNUSED_PARAM,
86 return 0; 86 return 0;
87} 87}
88 88
89const char *ll_idx_n2a(int idx, char *buf) 89const char FAST_FUNC *ll_idx_n2a(int idx, char *buf)
90{ 90{
91 struct idxmap *im; 91 struct idxmap *im;
92 92
@@ -100,7 +100,7 @@ const char *ll_idx_n2a(int idx, char *buf)
100} 100}
101 101
102 102
103const char *ll_index_to_name(int idx) 103const char FAST_FUNC *ll_index_to_name(int idx)
104{ 104{
105 static char nbuf[16]; 105 static char nbuf[16];
106 106
@@ -121,7 +121,7 @@ int ll_index_to_type(int idx)
121} 121}
122#endif 122#endif
123 123
124unsigned ll_index_to_flags(int idx) 124unsigned FAST_FUNC ll_index_to_flags(int idx)
125{ 125{
126 struct idxmap *im; 126 struct idxmap *im;
127 127
@@ -133,7 +133,7 @@ unsigned ll_index_to_flags(int idx)
133 return 0; 133 return 0;
134} 134}
135 135
136int xll_name_to_index(const char *name) 136int FAST_FUNC xll_name_to_index(const char *name)
137{ 137{
138 int ret = 0; 138 int ret = 0;
139 int sock_fd; 139 int sock_fd;
@@ -192,7 +192,7 @@ int xll_name_to_index(const char *name)
192 return ret; 192 return ret;
193} 193}
194 194
195int ll_init_map(struct rtnl_handle *rth) 195int FAST_FUNC ll_init_map(struct rtnl_handle *rth)
196{ 196{
197 xrtnl_wilddump_request(rth, AF_UNSPEC, RTM_GETLINK); 197 xrtnl_wilddump_request(rth, AF_UNSPEC, RTM_GETLINK);
198 xrtnl_dump_filter(rth, ll_remember_index, &idxmap); 198 xrtnl_dump_filter(rth, ll_remember_index, &idxmap);
diff --git a/networking/libiproute/ll_map.h b/networking/libiproute/ll_map.h
index b183cd6c6..c5d383422 100644
--- a/networking/libiproute/ll_map.h
+++ b/networking/libiproute/ll_map.h
@@ -4,13 +4,13 @@
4 4
5PUSH_AND_SET_FUNCTION_VISIBILITY_TO_HIDDEN 5PUSH_AND_SET_FUNCTION_VISIBILITY_TO_HIDDEN
6 6
7int ll_remember_index(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg); 7int ll_remember_index(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg) FAST_FUNC;
8int ll_init_map(struct rtnl_handle *rth); 8int ll_init_map(struct rtnl_handle *rth) FAST_FUNC;
9int xll_name_to_index(const char *name); 9int xll_name_to_index(const char *name) FAST_FUNC;
10const char *ll_index_to_name(int idx); 10const char *ll_index_to_name(int idx) FAST_FUNC;
11const char *ll_idx_n2a(int idx, char *buf); 11const char *ll_idx_n2a(int idx, char *buf) FAST_FUNC;
12/* int ll_index_to_type(int idx); */ 12/* int ll_index_to_type(int idx); */
13unsigned ll_index_to_flags(int idx); 13unsigned ll_index_to_flags(int idx) FAST_FUNC;
14 14
15POP_SAVED_FUNCTION_VISIBILITY 15POP_SAVED_FUNCTION_VISIBILITY
16 16