diff options
author | "Vladimir N. Oleynik" <dzo@simtreas.ru> | 2005-09-22 11:11:11 +0000 |
---|---|---|
committer | "Vladimir N. Oleynik" <dzo@simtreas.ru> | 2005-09-22 11:11:11 +0000 |
commit | 007a01164705f3b086f5f4633e63a32d6c6e16c6 (patch) | |
tree | bb27f8f1f884604a277af2e82a527fb05f18867b | |
parent | 9d7010ca86feff8fffdfecadf6554ca9aac268c1 (diff) | |
download | busybox-w32-007a01164705f3b086f5f4633e63a32d6c6e16c6.tar.gz busybox-w32-007a01164705f3b086f5f4633e63a32d6c6e16c6.tar.bz2 busybox-w32-007a01164705f3b086f5f4633e63a32d6c6e16c6.zip |
network "default" --> bb_INET_default. Reduce 2 exported from find applet
-rw-r--r-- | findutils/find.c | 4 | ||||
-rw-r--r-- | networking/libiproute/utils.c | 5 | ||||
-rw-r--r-- | 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 @@ | |||
34 | #include "busybox.h" | 34 | #include "busybox.h" |
35 | 35 | ||
36 | //XXX just found out about libbb/messages.c . maybe move stuff there ? - ghoz | 36 | //XXX just found out about libbb/messages.c . maybe move stuff there ? - ghoz |
37 | const char msg_req_arg[] = "option `%s' requires an argument"; | 37 | static const char msg_req_arg[] = "option `%s' requires an argument"; |
38 | const char msg_invalid_arg[] = "invalid argument `%s' to `%s'"; | 38 | static const char msg_invalid_arg[] = "invalid argument `%s' to `%s'"; |
39 | 39 | ||
40 | static char *pattern; | 40 | static char *pattern; |
41 | 41 | ||
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 @@ | |||
21 | 21 | ||
22 | #include "utils.h" | 22 | #include "utils.h" |
23 | #include "libbb.h" | 23 | #include "libbb.h" |
24 | #include "inet_common.h" | ||
24 | 25 | ||
25 | int get_integer(int *val, char *arg, int base) | 26 | int get_integer(int *val, char *arg, int base) |
26 | { | 27 | { |
@@ -128,7 +129,7 @@ int get_addr_1(inet_prefix * addr, char *name, int family) | |||
128 | 129 | ||
129 | memset(addr, 0, sizeof(*addr)); | 130 | memset(addr, 0, sizeof(*addr)); |
130 | 131 | ||
131 | if (strcmp(name, "default") == 0 || | 132 | if (strcmp(name, bb_INET_default) == 0 || |
132 | strcmp(name, "all") == 0 || strcmp(name, "any") == 0) { | 133 | strcmp(name, "all") == 0 || strcmp(name, "any") == 0) { |
133 | addr->family = family; | 134 | addr->family = family; |
134 | addr->bytelen = (family == AF_INET6 ? 16 : 4); | 135 | addr->bytelen = (family == AF_INET6 ? 16 : 4); |
@@ -172,7 +173,7 @@ int get_prefix_1(inet_prefix * dst, char *arg, int family) | |||
172 | 173 | ||
173 | memset(dst, 0, sizeof(*dst)); | 174 | memset(dst, 0, sizeof(*dst)); |
174 | 175 | ||
175 | if (strcmp(arg, "default") == 0 || strcmp(arg, "any") == 0) { | 176 | if (strcmp(arg, bb_INET_default) == 0 || strcmp(arg, "any") == 0) { |
176 | dst->family = family; | 177 | dst->family = family; |
177 | dst->bytelen = 0; | 178 | dst->bytelen = 0; |
178 | dst->bitlen = 0; | 179 | 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) | |||
347 | /* We know args isn't NULL from the check in route_main. */ | 347 | /* We know args isn't NULL from the check in route_main. */ |
348 | const char *target = *args++; | 348 | const char *target = *args++; |
349 | 349 | ||
350 | if (strcmp(target, "default") == 0) { | 350 | if (strcmp(target, bb_INET_default) == 0) { |
351 | prefix_len = 0; | 351 | prefix_len = 0; |
352 | memset(&sa6, 0, sizeof(sa6)); | 352 | memset(&sa6, 0, sizeof(sa6)); |
353 | } else { | 353 | } else { |