ip: code shrink

[oweals/busybox.git] / networking / libiproute / rtm_map.c

diff --git a/networking/libiproute/rtm_map.c b/networking/libiproute/rtm_map.c
index 593017bf12d5058befd5a8032a096e2822f66edb..3bab53baf2eb4e4c13e802a868acd6fab680c8f8 100644 (file)
--- a/networking/libiproute/rtm_map.c
+++ b/networking/libiproute/rtm_map.c
@@ -1,21 +1,18 @@
 /* vi: set sw=4 ts=4: */
 /*
- * rtm_map.c
- *
- *             This program is free software; you can redistribute it and/or
- *             modify it under the terms of the GNU General Public License
- *             as published by the Free Software Foundation; either version
- *             2 of the License, or (at your option) any later version.
- *
- * Authors:    Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
  *
+ * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
  */
 
 #include "libbb.h"
 #include "rt_names.h"
 #include "utils.h"
 
-const char *rtnl_rtntype_n2a(int id, char *buf, int len)
+const char* FAST_FUNC rtnl_rtntype_n2a(int id, char *buf)
 {
        switch (id) {
        case RTN_UNSPEC:
@@ -43,24 +40,25 @@ const char *rtnl_rtntype_n2a(int id, char *buf, int len)
        case RTN_XRESOLVE:
                return "xresolve";
        default:
-               snprintf(buf, len, "%d", id);
+               /* buf is SPRINT_BSIZE big */
+               sprintf(buf, "%d", id);
                return buf;
        }
 }
 
 
-int rtnl_rtntype_a2n(int *id, char *arg)
+int FAST_FUNC rtnl_rtntype_a2n(int *id, char *arg)
 {
-       static const char * const keywords[] = {
-               "local", "nat", "broadcast", "brd", "anycast",
-               "multicast", "prohibit", "unreachable", "blackhole",
-               "xresolve", "unicast", "throw", NULL
-       };
-       enum { ARG_local = 1, ARG_nat, ARG_broadcast, ARG_brd, ARG_anycast,
+       static const char keywords[] ALIGN1 =
+               "local\0""nat\0""broadcast\0""brd\0""anycast\0"
+               "multicast\0""prohibit\0""unreachable\0""blackhole\0"
+               "xresolve\0""unicast\0""throw\0";
+       enum {
+               ARG_local = 1, ARG_nat, ARG_broadcast, ARG_brd, ARG_anycast,
                ARG_multicast, ARG_prohibit, ARG_unreachable, ARG_blackhole,
                ARG_xresolve, ARG_unicast, ARG_throw
        };
-       const smalluint key = index_in_substr_array(keywords, arg) + 1;
+       const smalluint key = index_in_substrings(keywords, arg) + 1;
        char *end;
        unsigned long res;
 
@@ -88,14 +86,14 @@ int rtnl_rtntype_a2n(int *id, char *arg)
                res = RTN_THROW;
        else {
                res = strtoul(arg, &end, 0);
-               if (!end || end == arg || *end || res > 255)
+               if (end == arg || *end || res > 255)
                        return -1;
        }
        *id = res;
        return 0;
 }
 
-int get_rt_realms(uint32_t *realms, char *arg)
+int FAST_FUNC get_rt_realms(uint32_t *realms, char *arg)
 {
        uint32_t realm = 0;
        char *p = strchr(arg, '/');