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>

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,
         return 0;
 }
 
-const char FAST_FUNC *ll_idx_n2a(int idx, char *buf)
+static
+const char FAST_FUNC *ll_idx_n2a(int idx/*, char *buf*/)
 {
         struct idxmap *im;
 
@@ -95,15 +96,15 @@ const char FAST_FUNC *ll_idx_n2a(int idx, char *buf)
         im = find_by_index(idx);
         if (im)
                 return im->name;
-        snprintf(buf, 16, "if%d", idx);
-        return buf;
+        //snprintf(buf, 16, "if%d", idx);
+        //return buf;
+        return auto_string(xasprintf("if%d", idx));
 }
 
 const char FAST_FUNC *ll_index_to_name(int idx)
 {
-        static char nbuf[16];
-
-        return ll_idx_n2a(idx, nbuf);
+        //static char nbuf[16];
+        return ll_idx_n2a(idx/*, nbuf*/);
 }
 
 #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
 int ll_remember_index(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg) FAST_FUNC;
 int ll_init_map(struct rtnl_handle *rth) FAST_FUNC;
 int xll_name_to_index(const char *name) FAST_FUNC;
+//static: const char *ll_idx_n2a(int idx, char *buf) FAST_FUNC;
 const char *ll_index_to_name(int idx) FAST_FUNC;
-const char *ll_idx_n2a(int idx, char *buf) FAST_FUNC;
 /* int ll_index_to_type(int idx); */
 unsigned ll_index_to_flags(int idx) FAST_FUNC;