diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2015-10-09 17:59:56 +0200 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2015-10-09 17:59:56 +0200 |
commit | e52da5570eb93d6cb2950e55c48bd22edb5a9f18 (patch) | |
tree | e76f2f6dd399a131f52e2b5951ba99e1399a2179 /networking | |
parent | 550bf5b4a418378cd8f9fbbf5252fe57acdacb5a (diff) | |
download | busybox-w32-e52da5570eb93d6cb2950e55c48bd22edb5a9f18.tar.gz busybox-w32-e52da5570eb93d6cb2950e55c48bd22edb5a9f18.tar.bz2 busybox-w32-e52da5570eb93d6cb2950e55c48bd22edb5a9f18.zip |
libbb: auto_string() for efficient handling of temporary malloced stirngs
Use it in libiproute: get rid of one static string buffer.
function old new delta
auto_string - 51 +51
ll_index_to_name 10 49 +39
buffer_fill_and_print 169 178 +9
scan_recursive 378 380 +2
decode_one_format 732 734 +2
cmdputs 334 332 -2
static.cur_saved 4 1 -3
static.nbuf 16 - -16
printable_string 94 57 -37
ll_idx_n2a 53 - -53
------------------------------------------------------------------------------
(add/remove: 2/2 grow/shrink: 4/3 up/down: 103/-111) Total: -8 bytes
text data bss dec hex filename
939880 992 17496 958368 e9fa0 busybox_old
939880 992 17480 958352 e9f90 busybox_unstripped
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'networking')
-rw-r--r-- | networking/libiproute/ll_map.c | 13 | ||||
-rw-r--r-- | networking/libiproute/ll_map.h | 2 |
2 files changed, 8 insertions, 7 deletions
diff --git a/networking/libiproute/ll_map.c b/networking/libiproute/ll_map.c index feb6e8d22..e2b85fc7b 100644 --- a/networking/libiproute/ll_map.c +++ b/networking/libiproute/ll_map.c | |||
@@ -86,7 +86,8 @@ int FAST_FUNC ll_remember_index(const struct sockaddr_nl *who UNUSED_PARAM, | |||
86 | return 0; | 86 | return 0; |
87 | } | 87 | } |
88 | 88 | ||
89 | const char FAST_FUNC *ll_idx_n2a(int idx, char *buf) | 89 | static |
90 | const char FAST_FUNC *ll_idx_n2a(int idx/*, char *buf*/) | ||
90 | { | 91 | { |
91 | struct idxmap *im; | 92 | struct idxmap *im; |
92 | 93 | ||
@@ -95,15 +96,15 @@ const char FAST_FUNC *ll_idx_n2a(int idx, char *buf) | |||
95 | im = find_by_index(idx); | 96 | im = find_by_index(idx); |
96 | if (im) | 97 | if (im) |
97 | return im->name; | 98 | return im->name; |
98 | snprintf(buf, 16, "if%d", idx); | 99 | //snprintf(buf, 16, "if%d", idx); |
99 | return buf; | 100 | //return buf; |
101 | return auto_string(xasprintf("if%d", idx)); | ||
100 | } | 102 | } |
101 | 103 | ||
102 | const char FAST_FUNC *ll_index_to_name(int idx) | 104 | const char FAST_FUNC *ll_index_to_name(int idx) |
103 | { | 105 | { |
104 | static char nbuf[16]; | 106 | //static char nbuf[16]; |
105 | 107 | return ll_idx_n2a(idx/*, nbuf*/); | |
106 | return ll_idx_n2a(idx, nbuf); | ||
107 | } | 108 | } |
108 | 109 | ||
109 | #ifdef UNUSED | 110 | #ifdef UNUSED |
diff --git a/networking/libiproute/ll_map.h b/networking/libiproute/ll_map.h index c5d383422..7ea383c81 100644 --- a/networking/libiproute/ll_map.h +++ b/networking/libiproute/ll_map.h | |||
@@ -7,8 +7,8 @@ PUSH_AND_SET_FUNCTION_VISIBILITY_TO_HIDDEN | |||
7 | int ll_remember_index(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg) FAST_FUNC; | 7 | int ll_remember_index(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg) FAST_FUNC; |
8 | int ll_init_map(struct rtnl_handle *rth) FAST_FUNC; | 8 | int ll_init_map(struct rtnl_handle *rth) FAST_FUNC; |
9 | int xll_name_to_index(const char *name) FAST_FUNC; | 9 | int xll_name_to_index(const char *name) FAST_FUNC; |
10 | //static: const char *ll_idx_n2a(int idx, char *buf) FAST_FUNC; | ||
10 | const char *ll_index_to_name(int idx) FAST_FUNC; | 11 | const char *ll_index_to_name(int idx) FAST_FUNC; |
11 | const 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); */ |
13 | unsigned ll_index_to_flags(int idx) FAST_FUNC; | 13 | unsigned ll_index_to_flags(int idx) FAST_FUNC; |
14 | 14 | ||