diff options
| -rw-r--r-- | networking/libiproute/iplink.c | 8 | ||||
| -rw-r--r-- | networking/libiproute/iproute.c | 18 |
2 files changed, 11 insertions, 15 deletions
diff --git a/networking/libiproute/iplink.c b/networking/libiproute/iplink.c index 90d60b44c..c9d218a11 100644 --- a/networking/libiproute/iplink.c +++ b/networking/libiproute/iplink.c @@ -35,7 +35,7 @@ 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; } @@ -204,7 +204,7 @@ static int parse_address(char *dev, int hatype, int halen, char *lla, struct ifr if (alen < 0) return -1; 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 0; @@ -286,7 +286,7 @@ static int do_set(int argc, char **argv) } 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); } @@ -344,6 +344,6 @@ int do_iplink(int argc, char **argv) } else 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); } diff --git a/networking/libiproute/iproute.c b/networking/libiproute/iproute.c index 8b6e7eebd..fcfb409f2 100644 --- a/networking/libiproute/iproute.c +++ b/networking/libiproute/iproute.c @@ -78,7 +78,7 @@ int print_route(struct sockaddr_nl *who, struct nlmsghdr *n, void *arg) } len -= NLMSG_LENGTH(sizeof(*r)); if (len < 0) { - fprintf(stderr, "BUG: wrong nlmsg len %d\n", len); + error_msg("wrong nlmsg len %d", len); return -1; } @@ -329,7 +329,7 @@ int iproute_modify(int cmd, unsigned flags, int argc, char **argv) if (d) { 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; } addattr32(&req.n, sizeof(req), RTA_OIF, idx); @@ -452,7 +452,7 @@ static int iproute_list(int argc, char **argv) if (id) { 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; } filter.iif = idx; @@ -460,8 +460,7 @@ static int iproute_list(int argc, char **argv) } if (od) { if ((idx = ll_name_to_index(od)) == 0) { - fprintf(stderr, "Cannot find device \"%s\"\n", od); - return -1; + error_msg("Cannot find device \"%s\"", od); } filter.oif = idx; filter.oifmask = -1; @@ -470,19 +469,16 @@ static int iproute_list(int argc, char **argv) if (filter.tb != -1) { if (rtnl_wilddump_request(&rth, do_ipv6, RTM_GETROUTE) < 0) { - perror("Cannot send dump request"); - exit(1); + perror_msg_and_die("Cannot send dump request"); } } else { if (rtnl_rtcache_request(&rth, do_ipv6) < 0) { - perror("Cannot send dump request"); - exit(1); + perror_msg_and_die("Cannot send dump request"); } } if (rtnl_dump_filter(&rth, print_route, stdout, NULL, NULL) < 0) { - fprintf(stderr, "Dump terminated\n"); - exit(1); + error_msg_and_die"Dump terminated"); } exit(0); |