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

Use standard error messages

Browse Source
This commit is contained in:
Glenn L McGrath 2002-11-28 10:56:38 +00:00
parent df72536f8e
commit 9048ae5923
2 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
networking/libiproute/iplink.c
View File

@ -35,7 +35,7 @@
static int on_off(char *msg) static int on_off(char *msg)
{ {
fprintf(stderr, "Error: argument of \"%s\" must be \"on\" or \"off\"\n", msg); error_msg("Error: argument of \"%s\" must be \"on\" or \"off\"", msg);
return -1; return -1;
} }
@ -204,7 +204,7 @@ static int parse_address(char *dev, int hatype, int halen, char *lla, struct ifr
if (alen < 0) if (alen < 0)
return -1; return -1;
if (alen != halen) { if (alen != halen) {
fprintf(stderr, "Wrong address (%s) length: expected %d bytes\n", lla, halen); error_msg("Wrong address (%s) length: expected %d bytes", lla, halen);
return -1; return -1;
} }
return 0; return 0;
@ -286,7 +286,7 @@ static int do_set(int argc, char **argv)
} }
if (!dev) { if (!dev) {
fprintf(stderr, "Not enough of information: \"dev\" argument is required.\n"); error_msg("Not enough of information: \"dev\" argument is required.");
exit(-1); exit(-1);
} }
@ -344,6 +344,6 @@ int do_iplink(int argc, char **argv)
} else } else
return ipaddr_list_link(0, NULL); return ipaddr_list_link(0, NULL);
fprintf(stderr, "Command \"%s\" is unknown, try \"ip link help\".\n", *argv); error_msg("Command \"%s\" is unknown, try \"ip link help\".", *argv);
exit(-1); exit(-1);
} }

18
networking/libiproute/iproute.c
View File

@ -78,7 +78,7 @@ int print_route(struct sockaddr_nl *who, struct nlmsghdr *n, void *arg)
} }
len -= NLMSG_LENGTH(sizeof(*r)); len -= NLMSG_LENGTH(sizeof(*r));
if (len < 0) { if (len < 0) {
fprintf(stderr, "BUG: wrong nlmsg len %d\n", len); error_msg("wrong nlmsg len %d", len);
return -1; return -1;
} }
@ -329,7 +329,7 @@ int iproute_modify(int cmd, unsigned flags, int argc, char **argv)
if (d) { if (d) {
if ((idx = ll_name_to_index(d)) == 0) { if ((idx = ll_name_to_index(d)) == 0) {
fprintf(stderr, "Cannot find device \"%s\"\n", d); error_msg("Cannot find device \"%s\"", d);
return -1; return -1;
} }
addattr32(&req.n, sizeof(req), RTA_OIF, idx); addattr32(&req.n, sizeof(req), RTA_OIF, idx);
@ -452,7 +452,7 @@ static int iproute_list(int argc, char **argv)
if (id) { if (id) {
if ((idx = ll_name_to_index(id)) == 0) { if ((idx = ll_name_to_index(id)) == 0) {
fprintf(stderr, "Cannot find device \"%s\"\n", id); error_msg("Cannot find device \"%s\"", id);
return -1; return -1;
} }
filter.iif = idx; filter.iif = idx;
@ -460,8 +460,7 @@ static int iproute_list(int argc, char **argv)
} }
if (od) { if (od) {
if ((idx = ll_name_to_index(od)) == 0) { if ((idx = ll_name_to_index(od)) == 0) {
fprintf(stderr, "Cannot find device \"%s\"\n", od); error_msg("Cannot find device \"%s\"", od);
return -1;
} }
filter.oif = idx; filter.oif = idx;
filter.oifmask = -1; filter.oifmask = -1;
@ -470,19 +469,16 @@ static int iproute_list(int argc, char **argv)
if (filter.tb != -1) { if (filter.tb != -1) {
if (rtnl_wilddump_request(&rth, do_ipv6, RTM_GETROUTE) < 0) { if (rtnl_wilddump_request(&rth, do_ipv6, RTM_GETROUTE) < 0) {
perror("Cannot send dump request"); perror_msg_and_die("Cannot send dump request");
exit(1);
} }
} else { } else {
if (rtnl_rtcache_request(&rth, do_ipv6) < 0) { if (rtnl_rtcache_request(&rth, do_ipv6) < 0) {
perror("Cannot send dump request"); perror_msg_and_die("Cannot send dump request");
exit(1);
} }
} }
if (rtnl_dump_filter(&rth, print_route, stdout, NULL, NULL) < 0) { if (rtnl_dump_filter(&rth, print_route, stdout, NULL, NULL) < 0) {
fprintf(stderr, "Dump terminated\n"); error_msg_and_die"Dump terminated");
exit(1);
} }
exit(0); exit(0);