svn commit: trunk/busybox: findutils networking networking/libiprou etc...

vodz at busybox.net vodz at busybox.net
Thu Sep 22 11:11:13 UTC 2005


Author: vodz
Date: 2005-09-22 04:11:11 -0700 (Thu, 22 Sep 2005)
New Revision: 11573

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

Modified:
   trunk/busybox/findutils/find.c
   trunk/busybox/networking/libiproute/utils.c
   trunk/busybox/networking/route.c


Changeset:
Modified: trunk/busybox/findutils/find.c
===================================================================
--- trunk/busybox/findutils/find.c	2005-09-22 09:45:02 UTC (rev 11572)
+++ trunk/busybox/findutils/find.c	2005-09-22 11:11:11 UTC (rev 11573)
@@ -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;
 

Modified: trunk/busybox/networking/libiproute/utils.c
===================================================================
--- trunk/busybox/networking/libiproute/utils.c	2005-09-22 09:45:02 UTC (rev 11572)
+++ trunk/busybox/networking/libiproute/utils.c	2005-09-22 11:11:11 UTC (rev 11573)
@@ -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 @@
 
 	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 @@
 
 	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;

Modified: trunk/busybox/networking/route.c
===================================================================
--- trunk/busybox/networking/route.c	2005-09-22 09:45:02 UTC (rev 11572)
+++ trunk/busybox/networking/route.c	2005-09-22 11:11:11 UTC (rev 11573)
@@ -347,7 +347,7 @@
 		/* 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 {




More information about the busybox-cvs mailing list