emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor error messages changes

Browse Source
This commit is contained in:
Glenn L McGrath 2002-11-28 12:39:19 +00:00
parent d4de975cd2
commit 1b0813ab61
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
networking/libiproute/ll_addr.c
View File

@ -26,7 +26,7 @@
#include <linux/sockios.h> #include <linux/sockios.h>
#include "utils.h" #include "utils.h"
#include "libbb.h"
const char *ll_addr_n2a(unsigned char *addr, int alen, int type, char *buf, int blen) const char *ll_addr_n2a(unsigned char *addr, int alen, int type, char *buf, int blen)
{ {
@ -57,11 +57,12 @@ int ll_addr_a2n(unsigned char *lladdr, int len, char *arg)
if (strchr(arg, '.')) { if (strchr(arg, '.')) {
inet_prefix pfx; inet_prefix pfx;
if (get_addr_1(&pfx, arg, AF_INET)) { if (get_addr_1(&pfx, arg, AF_INET)) {
fprintf(stderr, "\"%s\" is invalid lladdr.\n", arg); error_msg("\"%s\" is invalid lladdr.", arg);
return -1; return -1;
} }
if (len < 4) if (len < 4) {
return -1; return -1;
}
memcpy(lladdr, pfx.data, 4); memcpy(lladdr, pfx.data, 4);
return 4; return 4;
} else { } else {
@ -75,16 +76,17 @@ int ll_addr_a2n(unsigned char *lladdr, int len, char *arg)
cp++; cp++;
} }
if (sscanf(arg, "%x", &temp) != 1) { if (sscanf(arg, "%x", &temp) != 1) {
fprintf(stderr, "\"%s\" is invalid lladdr.\n", arg); error_msg("\"%s\" is invalid lladdr.", arg);
return -1; return -1;
} }
if (temp < 0 || temp > 255) { if (temp < 0 || temp > 255) {
fprintf(stderr, "\"%s\" is invalid lladdr.\n", arg); error_msg("\"%s\" is invalid lladdr.", arg);
return -1; return -1;
} }
lladdr[i] = temp; lladdr[i] = temp;
if (!cp) if (!cp) {
break; break;
}
arg = cp; arg = cp;
} }
return i+1; return i+1;