X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fnetlink.c;h=1978eb43169d7af8d5951818df0d680d72a3464b;hb=849f5394cce97a76da080f6cd9e5194b7f4ee0f0;hp=0f71ce7c52a4c26022c2a398980c47e8e3fed782;hpb=77ca1a45bab2f6adf9301723d0db68e5813a6d98;p=collectd.git diff --git a/src/netlink.c b/src/netlink.c index 0f71ce7c..1978eb43 100644 --- a/src/netlink.c +++ b/src/netlink.c @@ -358,10 +358,9 @@ static int link_filter_cb(const struct nlmsghdr *nlh, continue; if (mnl_attr_validate2(attr, MNL_TYPE_UNSPEC, sizeof(*stats.stats64)) < 0) { - char errbuf[1024]; ERROR("netlink plugin: link_filter_cb: IFLA_STATS64 mnl_attr_validate2 " "failed: %s", - sstrerror(errno, errbuf, sizeof(errbuf))); + STRERRNO); return MNL_CB_ERROR; } stats.stats64 = mnl_attr_get_payload(attr); @@ -376,10 +375,9 @@ static int link_filter_cb(const struct nlmsghdr *nlh, continue; if (mnl_attr_validate2(attr, MNL_TYPE_UNSPEC, sizeof(*stats.stats32)) < 0) { - char errbuf[1024]; ERROR("netlink plugin: link_filter_cb: IFLA_STATS mnl_attr_validate2 " "failed: %s", - sstrerror(errno, errbuf, sizeof(errbuf))); + STRERRNO); return MNL_CB_ERROR; } stats.stats32 = mnl_attr_get_payload(attr); @@ -404,10 +402,9 @@ static int qos_attr_cb(const struct nlattr *attr, void *data) { if (mnl_attr_get_type(attr) == TCA_STATS_BASIC) { if (mnl_attr_validate2(attr, MNL_TYPE_UNSPEC, sizeof(*q_stats->bs)) < 0) { - char errbuf[1024]; ERROR("netlink plugin: qos_attr_cb: TCA_STATS_BASIC mnl_attr_validate2 " "failed: %s", - sstrerror(errno, errbuf, sizeof(errbuf))); + STRERRNO); return MNL_CB_ERROR; } q_stats->bs = mnl_attr_get_payload(attr); @@ -556,10 +553,9 @@ static int qos_filter_cb(const struct nlmsghdr *nlh, void *args) { continue; if (mnl_attr_validate2(attr, MNL_TYPE_UNSPEC, sizeof(*ts)) < 0) { - char errbuf[1024]; ERROR("netlink plugin: qos_filter_cb: TCA_STATS mnl_attr_validate2 " "failed: %s", - sstrerror(errno, errbuf, sizeof(errbuf))); + STRERRNO); return MNL_CB_ERROR; } ts = mnl_attr_get_payload(attr); @@ -694,9 +690,7 @@ static int ir_read(void) { ret = mnl_socket_recvfrom(nl, buf, sizeof(buf)); } if (ret < 0) { - char errbuf[1024]; - ERROR("netlink plugin: ir_read: mnl_socket_recvfrom failed: %s", - sstrerror(errno, errbuf, sizeof(errbuf))); + ERROR("netlink plugin: ir_read: mnl_socket_recvfrom failed: %s", STRERRNO); return (-1); } @@ -741,9 +735,8 @@ static int ir_read(void) { ret = mnl_socket_recvfrom(nl, buf, sizeof(buf)); } if (ret < 0) { - char errbuf[1024]; ERROR("netlink plugin: ir_read: mnl_socket_recvfrom failed: %s", - sstrerror(errno, errbuf, sizeof(errbuf))); + STRERRNO); continue; } } /* for (type_index) */