network "default" --> bb_INET_default. Reduce 2 exported from find applet

diff --git a/findutils/find.c b/findutils/find.c
index abbd82b3a0a200a1efb8490251fd8bd104196590..334a7b56e9d8a295a0c9e3b2299cce0188b18056 100644 (file)
--- a/findutils/find.c
+++ b/findutils/find.c
@@ -34,8 +34,8 @@
 #include "busybox.h"
 
 //XXX just found out about libbb/messages.c . maybe move stuff there ? - ghoz
-const char msg_req_arg[] = "option `%s' requires an argument";
-const char msg_invalid_arg[] = "invalid argument `%s' to `%s'";
+static const char msg_req_arg[] = "option `%s' requires an argument";
+static const char msg_invalid_arg[] = "invalid argument `%s' to `%s'";
 
 static char *pattern;
 

diff --git a/networking/libiproute/utils.c b/networking/libiproute/utils.c
index d86d4f8f5cd30271e2f11e781be4f6309fb157ef..e6b386c1d3a936775f5c3c5a8951bbccd349e402 100644 (file)
--- a/networking/libiproute/utils.c
+++ b/networking/libiproute/utils.c
@@ -21,6 +21,7 @@
 
 #include "utils.h"
 #include "libbb.h"
+#include "inet_common.h"
 
 int get_integer(int *val, char *arg, int base)
 {
@@ -128,7 +129,7 @@ int get_addr_1(inet_prefix * addr, char *name, int family)
 
        memset(addr, 0, sizeof(*addr));
 
-       if (strcmp(name, "default") == 0 ||
+       if (strcmp(name, bb_INET_default) == 0 ||
                strcmp(name, "all") == 0 || strcmp(name, "any") == 0) {
                addr->family = family;
                addr->bytelen = (family == AF_INET6 ? 16 : 4);
@@ -172,7 +173,7 @@ int get_prefix_1(inet_prefix * dst, char *arg, int family)
 
        memset(dst, 0, sizeof(*dst));
 
-       if (strcmp(arg, "default") == 0 || strcmp(arg, "any") == 0) {
+       if (strcmp(arg, bb_INET_default) == 0 || strcmp(arg, "any") == 0) {
                dst->family = family;
                dst->bytelen = 0;
                dst->bitlen = 0;

diff --git a/networking/route.c b/networking/route.c
index 7d4cb0b760f0dad3c400bc46768bda4dc7d359e2..bb5f9405b024d79bcaf35a14a12bce72ab915ef0 100644 (file)
--- a/networking/route.c
+++ b/networking/route.c
@@ -347,7 +347,7 @@ static void INET6_setroute(int action, char **args)
                /* We know args isn't NULL from the check in route_main. */
                const char *target = *args++;
 
-               if (strcmp(target, "default") == 0) {
+               if (strcmp(target, bb_INET_default) == 0) {
                        prefix_len = 0;
                        memset(&sa6, 0, sizeof(sa6));
                } else {