libiproute/*: code shrink

function                                             old     new   delta
ll_addr_a2n                                          181     178      -3
rtnl_rtntype_a2n                                     198     194      -4
ipaddr_modify                                       1309    1305      -4
print_addrinfo                                      1303    1298      -5
do_iplink                                           1137    1132      -5
print_route                                         1609    1603      -6
parse_args                                          1440    1434      -6
iproute_list_or_flush                               1261    1254      -7
rtnl_rttable_a2n                                      39      31      -8
rtnl_rtscope_a2n                                      39      31      -8
rtnl_rtrealm_a2n                                      39      31      -8
rtnl_rtprot_a2n                                       39      31      -8
rtnl_dsfield_a2n                                      39      31      -8
ll_type_n2a                                           78      70      -8
get_rt_realms                                        115     107      -8
print_tunnel                                         656     647      -9
rtnl_rttable_n2a                                      63      53     -10
rtnl_rtscope_n2a                                      63      53     -10
rtnl_rtrealm_n2a                                      63      53     -10
rtnl_rtntype_n2a                                     128     118     -10
rtnl_dsfield_n2a                                      71      61     -10
print_linkinfo                                       815     805     -10
ipaddr_list_or_flush                                1246    1235     -11
iproute_modify                                      1048    1036     -12
iprule_modify                                        866     851     -15
print_rule                                           765     738     -27
ll_addr_n2a                                          182     150     -32
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 0/27 up/down: 0/-262)          Total: -262 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko
2009-10-13 17:58:24 +02:00
parent 94466b8b8c
commit d31575a3ae
11 changed files with 68 additions and 61 deletions

View File

@@ -90,10 +90,10 @@ static void rtnl_rtprot_initialize(void)
rtnl_tab_initialize("/etc/iproute2/rt_protos", rtnl_rtprot_tab->tab);
}
const char* rtnl_rtprot_n2a(int id, char *buf, int len)
const char* FAST_FUNC rtnl_rtprot_n2a(int id, char *buf)
{
if (id < 0 || id >= 256) {
snprintf(buf, len, "%d", id);
sprintf(buf, "%d", id);
return buf;
}
@@ -101,11 +101,12 @@ const char* rtnl_rtprot_n2a(int id, char *buf, int len)
if (rtnl_rtprot_tab->tab[id])
return rtnl_rtprot_tab->tab[id];
snprintf(buf, len, "%d", id);
/* buf is SPRINT_BSIZE big */
sprintf(buf, "%d", id);
return buf;
}
int rtnl_rtprot_a2n(uint32_t *id, char *arg)
int FAST_FUNC rtnl_rtprot_a2n(uint32_t *id, char *arg)
{
rtnl_rtprot_initialize();
return rtnl_a2n(rtnl_rtprot_tab, id, arg, 0);
@@ -127,10 +128,10 @@ static void rtnl_rtscope_initialize(void)
rtnl_tab_initialize("/etc/iproute2/rt_scopes", rtnl_rtscope_tab->tab);
}
const char* rtnl_rtscope_n2a(int id, char *buf, int len)
const char* FAST_FUNC rtnl_rtscope_n2a(int id, char *buf)
{
if (id < 0 || id >= 256) {
snprintf(buf, len, "%d", id);
sprintf(buf, "%d", id);
return buf;
}
@@ -138,11 +139,12 @@ const char* rtnl_rtscope_n2a(int id, char *buf, int len)
if (rtnl_rtscope_tab->tab[id])
return rtnl_rtscope_tab->tab[id];
snprintf(buf, len, "%d", id);
/* buf is SPRINT_BSIZE big */
sprintf(buf, "%d", id);
return buf;
}
int rtnl_rtscope_a2n(uint32_t *id, char *arg)
int FAST_FUNC rtnl_rtscope_a2n(uint32_t *id, char *arg)
{
rtnl_rtscope_initialize();
return rtnl_a2n(rtnl_rtscope_tab, id, arg, 0);
@@ -159,17 +161,17 @@ static void rtnl_rtrealm_initialize(void)
rtnl_tab_initialize("/etc/iproute2/rt_realms", rtnl_rtrealm_tab->tab);
}
int rtnl_rtrealm_a2n(uint32_t *id, char *arg)
int FAST_FUNC rtnl_rtrealm_a2n(uint32_t *id, char *arg)
{
rtnl_rtrealm_initialize();
return rtnl_a2n(rtnl_rtrealm_tab, id, arg, 0);
}
#if ENABLE_FEATURE_IP_RULE
const char* rtnl_rtrealm_n2a(int id, char *buf, int len)
const char* FAST_FUNC rtnl_rtrealm_n2a(int id, char *buf)
{
if (id < 0 || id >= 256) {
snprintf(buf, len, "%d", id);
sprintf(buf, "%d", id);
return buf;
}
@@ -177,7 +179,8 @@ const char* rtnl_rtrealm_n2a(int id, char *buf, int len)
if (rtnl_rtrealm_tab->tab[id])
return rtnl_rtrealm_tab->tab[id];
snprintf(buf, len, "%d", id);
/* buf is SPRINT_BSIZE big */
sprintf(buf, "%d", id);
return buf;
}
#endif
@@ -193,10 +196,10 @@ static void rtnl_rtdsfield_initialize(void)
rtnl_tab_initialize("/etc/iproute2/rt_dsfield", rtnl_rtdsfield_tab->tab);
}
const char * rtnl_dsfield_n2a(int id, char *buf, int len)
const char* FAST_FUNC rtnl_dsfield_n2a(int id, char *buf)
{
if (id < 0 || id >= 256) {
snprintf(buf, len, "%d", id);
sprintf(buf, "%d", id);
return buf;
}
@@ -204,11 +207,12 @@ const char * rtnl_dsfield_n2a(int id, char *buf, int len)
if (rtnl_rtdsfield_tab->tab[id])
return rtnl_rtdsfield_tab->tab[id];
snprintf(buf, len, "0x%02x", id);
/* buf is SPRINT_BSIZE big */
sprintf(buf, "0x%02x", id);
return buf;
}
int rtnl_dsfield_a2n(uint32_t *id, char *arg)
int FAST_FUNC rtnl_dsfield_a2n(uint32_t *id, char *arg)
{
rtnl_rtdsfield_initialize();
return rtnl_a2n(rtnl_rtdsfield_tab, id, arg, 16);
@@ -229,10 +233,10 @@ static void rtnl_rttable_initialize(void)
rtnl_tab_initialize("/etc/iproute2/rt_tables", rtnl_rttable_tab->tab);
}
const char *rtnl_rttable_n2a(int id, char *buf, int len)
const char* FAST_FUNC rtnl_rttable_n2a(int id, char *buf)
{
if (id < 0 || id >= 256) {
snprintf(buf, len, "%d", id);
sprintf(buf, "%d", id);
return buf;
}
@@ -240,11 +244,12 @@ const char *rtnl_rttable_n2a(int id, char *buf, int len)
if (rtnl_rttable_tab->tab[id])
return rtnl_rttable_tab->tab[id];
snprintf(buf, len, "%d", id);
/* buf is SPRINT_BSIZE big */
sprintf(buf, "%d", id);
return buf;
}
int rtnl_rttable_a2n(uint32_t *id, char *arg)
int FAST_FUNC rtnl_rttable_a2n(uint32_t *id, char *arg)
{
rtnl_rttable_initialize();
return rtnl_a2n(rtnl_rttable_tab, id, arg, 0);