projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
apache plugin: modernize the code a bit
[collectd.git]
/
src
/
netlink.c
diff --git
a/src/netlink.c
b/src/netlink.c
index
b5ae3bd
..
1978eb4
100644
(file)
--- 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) {
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",
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);
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) {
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",
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);
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) {
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",
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);
return MNL_CB_ERROR;
}
q_stats->bs = mnl_attr_get_payload(attr);
@@
-464,7
+461,7
@@
static int qos_filter_cb(const struct nlmsghdr *nlh, void *args) {
if ((tm->tcm_ifindex >= 0) && ((size_t)tm->tcm_ifindex >= iflist_len)) {
ERROR("netlink plugin: qos_filter_cb: tm->tcm_ifindex = %i "
if ((tm->tcm_ifindex >= 0) && ((size_t)tm->tcm_ifindex >= iflist_len)) {
ERROR("netlink plugin: qos_filter_cb: tm->tcm_ifindex = %i "
- ">= iflist_len = %
zu"
,
+ ">= iflist_len = %
" PRIsz
,
tm->tcm_ifindex, iflist_len);
return MNL_CB_ERROR;
}
tm->tcm_ifindex, iflist_len);
return MNL_CB_ERROR;
}
@@
-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) {
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",
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);
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) {
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);
}
return (-1);
}
@@
-717,7
+711,7
@@
static int ir_read(void) {
continue;
}
continue;
}
- DEBUG("netlink plugin: ir_read: querying %s from %s (%
zu
).",
+ DEBUG("netlink plugin: ir_read: querying %s from %s (%
" PRIsz "
).",
type_name[type_index], iflist[ifindex], ifindex);
nlh = mnl_nlmsg_put_header(buf);
type_name[type_index], iflist[ifindex], ifindex);
nlh = mnl_nlmsg_put_header(buf);
@@
-741,9
+735,8
@@
static int ir_read(void) {
ret = mnl_socket_recvfrom(nl, buf, sizeof(buf));
}
if (ret < 0) {
ret = mnl_socket_recvfrom(nl, buf, sizeof(buf));
}
if (ret < 0) {
- char errbuf[1024];
ERROR("netlink plugin: ir_read: mnl_socket_recvfrom failed: %s",
ERROR("netlink plugin: ir_read: mnl_socket_recvfrom failed: %s",
-
sstrerror(errno, errbuf, sizeof(errbuf))
);
+
STRERRNO
);
continue;
}
} /* for (type_index) */
continue;
}
} /* for (type_index) */