ip: code shrink

function                                             old     new   delta
do_ipaddr                                             78      81      +3
do_iprule                                            140     139      -1
do_iptunnel                                          283     278      -5
iprule_modify                                        851     841     -10
ipaddr_modify                                       1293    1236     -57
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 1/4 up/down: 3/-73)             Total: -70 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

diff --git a/networking/libiproute/ipaddress.c b/networking/libiproute/ipaddress.c
index 3fd3f44..aa4779a 100644 (file)
--- a/networking/libiproute/ipaddress.c
+++ b/networking/libiproute/ipaddress.c
@@ -627,10 +627,12 @@ static int ipaddr_modify(int cmd, char **argv)
        req.ifa.ifa_family = preferred_family;
 
        while (*argv) {
-               const smalluint arg = index_in_strings(option, *argv);
-               if (arg <= 1) { /* peer, remote */
+               unsigned arg = index_in_strings(option, *argv);
+               /* if search fails, "local" is assumed */
+               if ((int)arg >= 0)
                        NEXT_ARG();
 
+               if (arg <= 1) { /* peer, remote */
                        if (peer_len) {
                                duparg("peer", *argv);
                        }
@@ -643,7 +645,6 @@ static int ipaddr_modify(int cmd, char **argv)
                        req.ifa.ifa_prefixlen = peer.bitlen;
                } else if (arg <= 3) { /* broadcast, brd */
                        inet_prefix addr;
-                       NEXT_ARG();
                        if (brd_len) {
                                duparg("broadcast", *argv);
                        }
@@ -660,7 +661,6 @@ static int ipaddr_modify(int cmd, char **argv)
                        }
                } else if (arg == 4) { /* anycast */
                        inet_prefix addr;
-                       NEXT_ARG();
                        if (any_len) {
                                duparg("anycast", *argv);
                        }
@@ -672,22 +672,18 @@ static int ipaddr_modify(int cmd, char **argv)
                        any_len = addr.bytelen;
                } else if (arg == 5) { /* scope */
                        uint32_t scope = 0;
-                       NEXT_ARG();
                        if (rtnl_rtscope_a2n(&scope, *argv)) {
                                invarg(*argv, "scope");
                        }
                        req.ifa.ifa_scope = scope;
                        scoped = 1;
                } else if (arg == 6) { /* dev */
-                       NEXT_ARG();
                        d = *argv;
                } else if (arg == 7) { /* label */
-                       NEXT_ARG();
                        l = *argv;
                        addattr_l(&req.n, sizeof(req), IFA_LABEL, l, strlen(l) + 1);
                } else {
-                       if (arg == 8) /* local */
-                               NEXT_ARG();
+                       /* local (specified or assumed) */
                        if (local_len) {
                                duparg2("local", *argv);
                        }
@@ -724,7 +720,7 @@ static int ipaddr_modify(int cmd, char **argv)
                }
                brd = peer;
                if (brd.bitlen <= 30) {
-                       for (i=31; i>=brd.bitlen; i--) {
+                       for (i = 31; i >= brd.bitlen; i--) {
                                if (brd_len == -1)
                                        brd.data[0] |= htonl(1<<(31-i));
                                else
@@ -754,11 +750,11 @@ int FAST_FUNC do_ipaddr(char **argv)
 {
        static const char commands[] ALIGN1 =
                "add\0""delete\0""list\0""show\0""lst\0""flush\0";
-       smalluint cmd = 2;
+       int cmd = 2;
        if (*argv) {
                cmd = index_in_substrings(commands, *argv);
-               if (cmd > 5)
-                       bb_error_msg_and_die(bb_msg_invalid_arg, *argv, applet_name);
+               if (cmd < 0)
+                       invarg(*argv, applet_name);
                argv++;
                if (cmd <= 1)
                        return ipaddr_modify((cmd == 0) ? RTM_NEWADDR : RTM_DELADDR, argv);

diff --git a/networking/libiproute/iprule.c b/networking/libiproute/iprule.c
index 241a6bf..8dbe6bd 100644 (file)
--- a/networking/libiproute/iprule.c
+++ b/networking/libiproute/iprule.c
@@ -215,7 +215,7 @@ static int iprule_modify(int cmd, char **argv)
        while (*argv) {
                key = index_in_substrings(keywords, *argv) + 1;
                if (key == 0) /* no match found in keywords array, bail out. */
-                       bb_error_msg_and_die(bb_msg_invalid_arg, *argv, applet_name);
+                       invarg(*argv, applet_name);
                if (key == ARG_from) {
                        inet_prefix dst;
                        NEXT_ARG();
@@ -308,9 +308,9 @@ int FAST_FUNC do_iprule(char **argv)
        static const char ip_rule_commands[] ALIGN1 =
                "add\0""delete\0""list\0""show\0";
        if (*argv) {
-               smalluint cmd = index_in_substrings(ip_rule_commands, *argv);
-               if (cmd > 3)
-                       bb_error_msg_and_die(bb_msg_invalid_arg, *argv, applet_name);
+               int cmd = index_in_substrings(ip_rule_commands, *argv);
+               if (cmd < 0)
+                       invarg(*argv, applet_name);
                argv++;
                if (cmd < 2)
                        return iprule_modify((cmd == 0) ? RTM_NEWRULE : RTM_DELRULE, argv);

diff --git a/networking/libiproute/iptunnel.c b/networking/libiproute/iptunnel.c
index 2b651b9..b54c3c5 100644 (file)
--- a/networking/libiproute/iptunnel.c
+++ b/networking/libiproute/iptunnel.c
@@ -561,9 +561,9 @@ int FAST_FUNC do_iptunnel(char **argv)
        enum { ARG_add = 0, ARG_change, ARG_del, ARG_show, ARG_list, ARG_lst };
 
        if (*argv) {
-               smalluint key = index_in_substrings(keywords, *argv);
-               if (key > 5)
-                       bb_error_msg_and_die(bb_msg_invalid_arg, *argv, applet_name);
+               int key = index_in_substrings(keywords, *argv);
+               if (key < 0)
+                       invarg(*argv, applet_name);
                argv++;
                if (key == ARG_add)
                        return do_add(SIOCADDTUNNEL, argv);