ip: code shrink

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

diff --git a/networking/libiproute/iprule.c b/networking/libiproute/iprule.c
index dd3265c7cd82ffcea819dc73d0a7d06674175e2d..8dbe6bd92a5a1306423ee046dd202a235208b94f 100644 (file)
--- a/networking/libiproute/iprule.c
+++ b/networking/libiproute/iprule.c
@@ -73,15 +73,17 @@ static int FAST_FUNC print_rule(const struct sockaddr_nl *who UNUSED_PARAM,
        if (tb[RTA_SRC]) {
                if (r->rtm_src_len != host_len) {
                        printf("%s/%u", rt_addr_n2a(r->rtm_family,
-                                                        RTA_DATA(tb[RTA_SRC]),
-                                                        abuf, sizeof(abuf)),
+                                                       RTA_DATA(tb[RTA_SRC]),
+                                                       abuf, sizeof(abuf)),
                                r->rtm_src_len
-                               );
+                       );
                } else {
                        fputs(format_host(r->rtm_family,
-                                                      RTA_PAYLOAD(tb[RTA_SRC]),
-                                                      RTA_DATA(tb[RTA_SRC]),
-                                                      abuf, sizeof(abuf)), stdout);
+                                               RTA_PAYLOAD(tb[RTA_SRC]),
+                                               RTA_DATA(tb[RTA_SRC]),
+                                               abuf, sizeof(abuf)),
+                               stdout
+                       );
                }
        } else if (r->rtm_src_len) {
                printf("0/%d", r->rtm_src_len);
@@ -213,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();
@@ -306,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);