diff options
Diffstat (limited to 'networking/libiproute/libnetlink.c')
| -rw-r--r-- | networking/libiproute/libnetlink.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/networking/libiproute/libnetlink.c b/networking/libiproute/libnetlink.c index b0d4166ac..7e3473a1c 100644 --- a/networking/libiproute/libnetlink.c +++ b/networking/libiproute/libnetlink.c @@ -79,7 +79,7 @@ int FAST_FUNC rtnl_send_check(struct rtnl_handle *rth, const void *buf, int len) if (h->nlmsg_type == NLMSG_ERROR) { struct nlmsgerr *err = (struct nlmsgerr*)NLMSG_DATA(h); if (h->nlmsg_len < NLMSG_LENGTH(sizeof(struct nlmsgerr))) - bb_error_msg("ERROR truncated"); + bb_simple_error_msg("ERROR truncated"); else errno = -err->error; return -1; @@ -149,11 +149,11 @@ static int rtnl_dump_filter(struct rtnl_handle *rth, if (status < 0) { if (errno == EINTR) continue; - bb_perror_msg("OVERRUN"); + bb_simple_perror_msg("OVERRUN"); continue; } if (status == 0) { - bb_error_msg("EOF on netlink"); + bb_simple_error_msg("EOF on netlink"); goto ret; } if (msg.msg_namelen != sizeof(nladdr)) { @@ -184,10 +184,10 @@ static int rtnl_dump_filter(struct rtnl_handle *rth, if (h->nlmsg_type == NLMSG_ERROR) { struct nlmsgerr *l_err = (struct nlmsgerr*)NLMSG_DATA(h); if (h->nlmsg_len < NLMSG_LENGTH(sizeof(struct nlmsgerr))) { - bb_error_msg("ERROR truncated"); + bb_simple_error_msg("ERROR truncated"); } else { errno = -l_err->error; - bb_perror_msg("RTNETLINK answers"); + bb_simple_perror_msg("RTNETLINK answers"); } goto ret; } @@ -201,7 +201,7 @@ static int rtnl_dump_filter(struct rtnl_handle *rth, h = NLMSG_NEXT(h, status); } if (msg.msg_flags & MSG_TRUNC) { - bb_error_msg("message truncated"); + bb_simple_error_msg("message truncated"); continue; } if (status) { @@ -221,7 +221,7 @@ int FAST_FUNC xrtnl_dump_filter(struct rtnl_handle *rth, { int ret = rtnl_dump_filter(rth, filter, arg1/*, NULL, NULL*/); if (ret < 0) - bb_error_msg_and_die("dump terminated"); + bb_simple_error_msg_and_die("dump terminated"); return ret; } @@ -266,7 +266,7 @@ int FAST_FUNC rtnl_talk(struct rtnl_handle *rtnl, struct nlmsghdr *n, status = sendmsg(rtnl->fd, &msg, 0); if (status < 0) { - bb_perror_msg("can't talk to rtnetlink"); + bb_simple_perror_msg("can't talk to rtnetlink"); goto ret; } @@ -280,11 +280,11 @@ int FAST_FUNC rtnl_talk(struct rtnl_handle *rtnl, struct nlmsghdr *n, if (errno == EINTR) { continue; } - bb_perror_msg("OVERRUN"); + bb_simple_perror_msg("OVERRUN"); continue; } if (status == 0) { - bb_error_msg("EOF on netlink"); + bb_simple_error_msg("EOF on netlink"); goto ret; } if (msg.msg_namelen != sizeof(nladdr)) { @@ -297,7 +297,7 @@ int FAST_FUNC rtnl_talk(struct rtnl_handle *rtnl, struct nlmsghdr *n, if (l < 0 || len > status) { if (msg.msg_flags & MSG_TRUNC) { - bb_error_msg("truncated message"); + bb_simple_error_msg("truncated message"); goto ret; } bb_error_msg_and_die("malformed message: len=%d!", len); @@ -320,7 +320,7 @@ int FAST_FUNC rtnl_talk(struct rtnl_handle *rtnl, struct nlmsghdr *n, if (h->nlmsg_type == NLMSG_ERROR) { struct nlmsgerr *err = (struct nlmsgerr*)NLMSG_DATA(h); if (l < (int)sizeof(struct nlmsgerr)) { - bb_error_msg("ERROR truncated"); + bb_simple_error_msg("ERROR truncated"); } else { errno = - err->error; if (errno == 0) { @@ -329,7 +329,7 @@ int FAST_FUNC rtnl_talk(struct rtnl_handle *rtnl, struct nlmsghdr *n, } goto ret_0; } - bb_perror_msg("RTNETLINK answers"); + bb_simple_perror_msg("RTNETLINK answers"); } goto ret; } @@ -338,13 +338,13 @@ int FAST_FUNC rtnl_talk(struct rtnl_handle *rtnl, struct nlmsghdr *n, goto ret_0; } - bb_error_msg("unexpected reply!"); + bb_simple_error_msg("unexpected reply!"); status -= NLMSG_ALIGN(len); h = (struct nlmsghdr*)((char*)h + NLMSG_ALIGN(len)); } if (msg.msg_flags & MSG_TRUNC) { - bb_error_msg("message truncated"); + bb_simple_error_msg("message truncated"); continue; } if (status) { |