From 007a01164705f3b086f5f4633e63a32d6c6e16c6 Mon Sep 17 00:00:00 2001
From: "\"Vladimir N. Oleynik\"" <dzo@simtreas.ru>
Date: Thu, 22 Sep 2005 11:11:11 +0000
Subject: network "default" --> bb_INET_default. Reduce 2 exported from find
 applet

---
 findutils/find.c              | 4 ++--
 networking/libiproute/utils.c | 5 +++--
 networking/route.c            | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/findutils/find.c b/findutils/find.c
index abbd82b3a..334a7b56e 100644
--- 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 d86d4f8f5..e6b386c1d 100644
--- 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 7d4cb0b76..bb5f9405b 100644
--- 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 {
-- 
cgit v1.2.3