*: introduce and use xfork()

[oweals/busybox.git] / networking / route.c

diff --git a/networking/route.c b/networking/route.c
index 55a6c2155d84858a067118d8801d17a4e89f6541..0146fa02914c05f236696eb655a5b98ffc6ed7fd 100644 (file)
--- a/networking/route.c
+++ b/networking/route.c
@@ -25,7 +25,6 @@
  * remove ridiculous amounts of bloat.
  */
 
-#include <getopt.h>
 #include <net/route.h>
 #include <net/if.h>
 
@@ -352,9 +351,10 @@ static void INET6_setroute(int action, char **args)
                        memset(&sa6, 0, sizeof(sa6));
                } else {
                        char *cp;
-                       if ((cp = strchr(target, '/'))) { /* Yes... const to non is ok. */
-                               *cp = 0;
-                               prefix_len = xatoul_range(cp+1, 0, 128);
+                       cp = strchr(target, '/'); /* Yes... const to non is ok. */
+                       if (cp) {
+                               *cp = '\0';
+                               prefix_len = xatoul_range(cp + 1, 0, 128);
                        } else {
                                prefix_len = 128;
                        }
@@ -476,7 +476,7 @@ static void set_flags(char *flagstr, int flags)
 }
 
 /* also used in netstat */
-void bb_displayroutes(int noresolve, int netstatfmt)
+void FAST_FUNC bb_displayroutes(int noresolve, int netstatfmt)
 {
        char devname[64], flags[16], *sdest, *sgw;
        unsigned long d, g, m;
@@ -538,7 +538,7 @@ void bb_displayroutes(int noresolve, int netstatfmt)
 
 #if ENABLE_FEATURE_IPV6
 
-static void INET6_displayroutes(int noresolve)
+static void INET6_displayroutes(void)
 {
        char addr6[128], *naddr6;
        /* In addr6x, we store both 40-byte ':'-delimited ipv6 addresses.
@@ -640,8 +640,8 @@ static const char tbl_verb[] ALIGN1 =
        "\010\002delete"  /* Since it's last, we can save a byte. */
 ;
 
-int route_main(int argc, char **argv);
-int route_main(int argc, char **argv)
+int route_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int route_main(int argc ATTRIBUTE_UNUSED, char **argv)
 {
        unsigned opt;
        int what;
@@ -674,7 +674,7 @@ int route_main(int argc, char **argv)
                int noresolve = (opt & ROUTE_OPT_n) ? 0x0fff : 0;
 #if ENABLE_FEATURE_IPV6
                if (opt & ROUTE_OPT_INET6)
-                       INET6_displayroutes(noresolve);
+                       INET6_displayroutes();
                else
 #endif
                        bb_displayroutes(noresolve, opt & ROUTE_OPT_e);