diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2007-01-29 23:43:52 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2007-01-29 23:43:52 +0000 |
| commit | 322661d025626d7a92482fec232d29f4450dd4b0 (patch) | |
| tree | 66dcf2c776adea8556d2ebac5e3f7d8a27f05074 /networking/interface.c | |
| parent | 89ef65f02463b27313ff0eba806aa6e4aec10716 (diff) | |
| download | busybox-w32-322661d025626d7a92482fec232d29f4450dd4b0.tar.gz busybox-w32-322661d025626d7a92482fec232d29f4450dd4b0.tar.bz2 busybox-w32-322661d025626d7a92482fec232d29f4450dd4b0.zip | |
preparatory patch for -Wwrite-strings #6
Diffstat (limited to 'networking/interface.c')
| -rw-r--r-- | networking/interface.c | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/networking/interface.c b/networking/interface.c index fbcf50152..f345cb09d 100644 --- a/networking/interface.c +++ b/networking/interface.c | |||
| @@ -31,18 +31,9 @@ | |||
| 31 | * (default AF was wrong) | 31 | * (default AF was wrong) |
| 32 | */ | 32 | */ |
| 33 | 33 | ||
| 34 | #include "inet_common.h" | ||
| 35 | #include <stdio.h> | ||
| 36 | #include <errno.h> | ||
| 37 | #include <stdlib.h> | ||
| 38 | #include <string.h> | ||
| 39 | #include <unistd.h> | ||
| 40 | #include <fcntl.h> | ||
| 41 | #include <ctype.h> | ||
| 42 | #include <sys/ioctl.h> | ||
| 43 | #include <sys/types.h> | ||
| 44 | #include <net/if.h> | 34 | #include <net/if.h> |
| 45 | #include <net/if_arp.h> | 35 | #include <net/if_arp.h> |
| 36 | #include "inet_common.h" | ||
| 46 | #include "busybox.h" | 37 | #include "busybox.h" |
| 47 | 38 | ||
| 48 | #ifdef CONFIG_FEATURE_IPV6 | 39 | #ifdef CONFIG_FEATURE_IPV6 |
| @@ -178,8 +169,7 @@ static char *INET6_sprint(struct sockaddr *sap, int numeric) | |||
| 178 | 169 | ||
| 179 | if (sap->sa_family == 0xFFFF || sap->sa_family == 0) | 170 | if (sap->sa_family == 0xFFFF || sap->sa_family == 0) |
| 180 | return safe_strncpy(buff, "[NONE SET]", sizeof(buff)); | 171 | return safe_strncpy(buff, "[NONE SET]", sizeof(buff)); |
| 181 | if (INET6_rresolve | 172 | if (INET6_rresolve(buff, sizeof(buff), (struct sockaddr_in6 *) sap, numeric)) |
| 182 | (buff, sizeof(buff), (struct sockaddr_in6 *) sap, numeric) != 0) | ||
| 183 | return safe_strncpy(buff, "[UNKNOWN]", sizeof(buff)); | 173 | return safe_strncpy(buff, "[UNKNOWN]", sizeof(buff)); |
| 184 | return buff; | 174 | return buff; |
| 185 | } | 175 | } |
| @@ -771,7 +761,7 @@ static int if_fetch(struct interface *ife) | |||
| 771 | static int do_if_fetch(struct interface *ife) | 761 | static int do_if_fetch(struct interface *ife) |
| 772 | { | 762 | { |
| 773 | if (if_fetch(ife) < 0) { | 763 | if (if_fetch(ife) < 0) { |
| 774 | char *errmsg; | 764 | const char *errmsg; |
| 775 | 765 | ||
| 776 | if (errno == ENODEV) { | 766 | if (errno == ENODEV) { |
| 777 | /* Give better error message for this case. */ | 767 | /* Give better error message for this case. */ |