diff options
author | Glenn L McGrath <bug1@ihug.co.nz> | 2002-11-28 12:39:19 +0000 |
---|---|---|
committer | Glenn L McGrath <bug1@ihug.co.nz> | 2002-11-28 12:39:19 +0000 |
commit | 1b0813ab613c59c875f142eebfde7a07fbc34964 (patch) | |
tree | 02820419075cf7903982f5b6a50ed6e70e22b6f0 /networking/libiproute | |
parent | d4de975cd2860e321b44211ecef4d61b050f1304 (diff) | |
download | busybox-w32-1b0813ab613c59c875f142eebfde7a07fbc34964.tar.gz busybox-w32-1b0813ab613c59c875f142eebfde7a07fbc34964.tar.bz2 busybox-w32-1b0813ab613c59c875f142eebfde7a07fbc34964.zip |
Minor error messages changes
Diffstat (limited to 'networking/libiproute')
-rw-r--r-- | networking/libiproute/ll_addr.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/networking/libiproute/ll_addr.c b/networking/libiproute/ll_addr.c index 51ff13b8c..19b31366c 100644 --- a/networking/libiproute/ll_addr.c +++ b/networking/libiproute/ll_addr.c | |||
@@ -26,7 +26,7 @@ | |||
26 | #include <linux/sockios.h> | 26 | #include <linux/sockios.h> |
27 | 27 | ||
28 | #include "utils.h" | 28 | #include "utils.h" |
29 | 29 | #include "libbb.h" | |
30 | 30 | ||
31 | const char *ll_addr_n2a(unsigned char *addr, int alen, int type, char *buf, int blen) | 31 | const char *ll_addr_n2a(unsigned char *addr, int alen, int type, char *buf, int blen) |
32 | { | 32 | { |
@@ -57,11 +57,12 @@ int ll_addr_a2n(unsigned char *lladdr, int len, char *arg) | |||
57 | if (strchr(arg, '.')) { | 57 | if (strchr(arg, '.')) { |
58 | inet_prefix pfx; | 58 | inet_prefix pfx; |
59 | if (get_addr_1(&pfx, arg, AF_INET)) { | 59 | if (get_addr_1(&pfx, arg, AF_INET)) { |
60 | fprintf(stderr, "\"%s\" is invalid lladdr.\n", arg); | 60 | error_msg("\"%s\" is invalid lladdr.", arg); |
61 | return -1; | 61 | return -1; |
62 | } | 62 | } |
63 | if (len < 4) | 63 | if (len < 4) { |
64 | return -1; | 64 | return -1; |
65 | } | ||
65 | memcpy(lladdr, pfx.data, 4); | 66 | memcpy(lladdr, pfx.data, 4); |
66 | return 4; | 67 | return 4; |
67 | } else { | 68 | } else { |
@@ -75,16 +76,17 @@ int ll_addr_a2n(unsigned char *lladdr, int len, char *arg) | |||
75 | cp++; | 76 | cp++; |
76 | } | 77 | } |
77 | if (sscanf(arg, "%x", &temp) != 1) { | 78 | if (sscanf(arg, "%x", &temp) != 1) { |
78 | fprintf(stderr, "\"%s\" is invalid lladdr.\n", arg); | 79 | error_msg("\"%s\" is invalid lladdr.", arg); |
79 | return -1; | 80 | return -1; |
80 | } | 81 | } |
81 | if (temp < 0 || temp > 255) { | 82 | if (temp < 0 || temp > 255) { |
82 | fprintf(stderr, "\"%s\" is invalid lladdr.\n", arg); | 83 | error_msg("\"%s\" is invalid lladdr.", arg); |
83 | return -1; | 84 | return -1; |
84 | } | 85 | } |
85 | lladdr[i] = temp; | 86 | lladdr[i] = temp; |
86 | if (!cp) | 87 | if (!cp) { |
87 | break; | 88 | break; |
89 | } | ||
88 | arg = cp; | 90 | arg = cp; |
89 | } | 91 | } |
90 | return i+1; | 92 | return i+1; |