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

Use error_msg_and_die, style

Browse Source
This commit is contained in:
Glenn L McGrath 2002-11-18 07:26:42 +00:00
parent 29d801b834
commit 50c00f4b45
1 changed files with 50 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
networking/libiproute/utils.c
View File

@ -136,8 +136,7 @@ int get_addr_1(inet_prefix *addr, char *name, int family)
memset(addr, 0, sizeof(*addr)); memset(addr, 0, sizeof(*addr));
if (strcmp(name, "default") == 0 || if (strcmp(name, "default") == 0 ||
strcmp(name, "all") == 0 || strcmp(name, "all") == 0 || strcmp(name, "any") == 0) {
strcmp(name, "any") == 0) {
addr->family = family; addr->family = family;
addr->bytelen = (family == AF_INET6 ? 16 : 4); addr->bytelen = (family == AF_INET6 ? 16 : 4);
addr->bitlen = -1; addr->bitlen = -1;
@ -217,11 +216,15 @@ done:
int get_addr(inet_prefix * dst, char *arg, int family) int get_addr(inet_prefix * dst, char *arg, int family)
{ {
if (family == AF_PACKET) { if (family == AF_PACKET) {
fprintf(stderr, "Error: \"%s\" may be inet address, but it is not allowed in this context.\n", arg); fprintf(stderr,
"Error: \"%s\" may be inet address, but it is not allowed in this context.\n",
arg);
exit(1); exit(1);
} }
if (get_addr_1(dst, arg, family)) { if (get_addr_1(dst, arg, family)) {
fprintf(stderr, "Error: an inet address is expected rather than \"%s\".\n", arg); fprintf(stderr,
"Error: an inet address is expected rather than \"%s\".\n",
arg);
exit(1); exit(1);
} }
return 0; return 0;
@ -230,11 +233,15 @@ int get_addr(inet_prefix *dst, char *arg, int family)
int get_prefix(inet_prefix * dst, char *arg, int family) int get_prefix(inet_prefix * dst, char *arg, int family)
{ {
if (family == AF_PACKET) { if (family == AF_PACKET) {
fprintf(stderr, "Error: \"%s\" may be inet prefix, but it is not allowed in this context.\n", arg); fprintf(stderr,
"Error: \"%s\" may be inet prefix, but it is not allowed in this context.\n",
arg);
exit(1); exit(1);
} }
if (get_prefix_1(dst, arg, family)) { if (get_prefix_1(dst, arg, family)) {
fprintf(stderr, "Error: an inet prefix is expected rather than \"%s\".\n", arg); fprintf(stderr,
"Error: an inet prefix is expected rather than \"%s\".\n",
arg);
exit(1); exit(1);
} }
return 0; return 0;
@ -243,8 +250,11 @@ int get_prefix(inet_prefix *dst, char *arg, int family)
__u32 get_addr32(char *name) __u32 get_addr32(char *name)
{ {
inet_prefix addr; inet_prefix addr;
if (get_addr_1(&addr, name, AF_INET)) { if (get_addr_1(&addr, name, AF_INET)) {
fprintf(stderr, "Error: an IP address is expected rather than \"%s\"\n", name); fprintf(stderr,
"Error: an IP address is expected rather than \"%s\"\n",
name);
exit(1); exit(1);
} }
return addr.data[0]; return addr.data[0];
@ -264,19 +274,23 @@ void invarg(char *msg, char *arg)
void duparg(char *key, char *arg) void duparg(char *key, char *arg)
{ {
fprintf(stderr, "Error: duplicate \"%s\": \"%s\" is the second value.\n", key, arg); fprintf(stderr, "Error: duplicate \"%s\": \"%s\" is the second value.\n",
key, arg);
exit(-1); exit(-1);
} }
void duparg2(char *key, char *arg) void duparg2(char *key, char *arg)
{ {
fprintf(stderr, "Error: either \"%s\" is duplicate, or \"%s\" is a garbage.\n", key, arg); fprintf(stderr,
"Error: either \"%s\" is duplicate, or \"%s\" is a garbage.\n",
key, arg);
exit(-1); exit(-1);
} }
int matches(char *cmd, char *pattern) int matches(char *cmd, char *pattern)
{ {
int len = strlen(cmd); int len = strlen(cmd);
if (len > strlen(pattern)) if (len > strlen(pattern))
return -1; return -1;
return memcmp(pattern, cmd, len); return memcmp(pattern, cmd, len);
@ -319,6 +333,7 @@ int __get_hz(void)
if (fp) { if (fp) {
unsigned nom, denom; unsigned nom, denom;
if (fscanf(fp, "%*08x%*08x%08x%08x", &nom, &denom) == 2) if (fscanf(fp, "%*08x%*08x%08x%08x", &nom, &denom) == 2)
if (nom == 1000000) if (nom == 1000000)
hz = denom; hz = denom;
@ -346,6 +361,7 @@ const char *format_host(int af, int len, void *addr, char *buf, int buflen)
#ifdef RESOLVE_HOSTNAMES #ifdef RESOLVE_HOSTNAMES
if (resolve_hosts) { if (resolve_hosts) {
struct hostent *h_ent; struct hostent *h_ent;
if (len <= 0) { if (len <= 0) {
switch (af) { switch (af) {
case AF_INET: case AF_INET:
@ -357,8 +373,7 @@ const char *format_host(int af, int len, void *addr, char *buf, int buflen)
default:; default:;
} }
} }
if (len > 0 && if (len > 0 && (h_ent = gethostbyaddr(addr, len, af)) != NULL) {
(h_ent = gethostbyaddr(addr, len, af)) != NULL) {
snprintf(buf, buflen - 1, "%s", h_ent->h_name); snprintf(buf, buflen - 1, "%s", h_ent->h_name);
return buf; return buf;
} }