projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
lua plugin: remove line feed in error message
[collectd.git]
/
src
/
ethstat.c
diff --git
a/src/ethstat.c
b/src/ethstat.c
index
3c03e36
..
f8bc5b5
100644
(file)
--- a/
src/ethstat.c
+++ b/
src/ethstat.c
@@
-24,9
+24,9
@@
#include "collectd.h"
#include "collectd.h"
-#include "common.h"
#include "plugin.h"
#include "plugin.h"
-#include "utils_avltree.h"
+#include "utils/avltree/avltree.h"
+#include "utils/common/common.h"
#include "utils_complain.h"
#if HAVE_SYS_IOCTL_H
#include "utils_complain.h"
#if HAVE_SYS_IOCTL_H
@@
-48,12
+48,12
@@
struct value_map_s {
};
typedef struct value_map_s value_map_t;
};
typedef struct value_map_s value_map_t;
-static char **interfaces
= NULL
;
-static size_t interfaces_num
= 0
;
+static char **interfaces;
+static size_t interfaces_num;
-static c_avl_tree_t *value_map
= NULL
;
+static c_avl_tree_t *value_map;
-static
_Bool collect_mapped_only = 0
;
+static
bool collect_mapped_only
;
static int ethstat_add_interface(const oconfig_item_t *ci) /* {{{ */
{
static int ethstat_add_interface(const oconfig_item_t *ci) /* {{{ */
{
@@
-204,9
+204,7
@@
static int ethstat_read_interface(char *device) {
fd = socket(AF_INET, SOCK_DGRAM, /* protocol = */ 0);
if (fd < 0) {
fd = socket(AF_INET, SOCK_DGRAM, /* protocol = */ 0);
if (fd < 0) {
- char errbuf[1024];
- ERROR("ethstat plugin: Failed to open control socket: %s",
- sstrerror(errno, errbuf, sizeof(errbuf)));
+ ERROR("ethstat plugin: Failed to open control socket: %s", STRERRNO);
return 1;
}
return 1;
}
@@
-218,11
+216,10
@@
static int ethstat_read_interface(char *device) {
status = ioctl(fd, SIOCETHTOOL, &req);
if (status < 0) {
status = ioctl(fd, SIOCETHTOOL, &req);
if (status < 0) {
- char errbuf[1024];
close(fd);
ERROR("ethstat plugin: Failed to get driver information "
"from %s: %s",
close(fd);
ERROR("ethstat plugin: Failed to get driver information "
"from %s: %s",
- device,
sstrerror(errno, errbuf, sizeof(errbuf))
);
+ device,
STRERRNO
);
return -1;
}
return -1;
}
@@
-252,12
+249,10
@@
static int ethstat_read_interface(char *device) {
req.ifr_data = (void *)strings;
status = ioctl(fd, SIOCETHTOOL, &req);
if (status < 0) {
req.ifr_data = (void *)strings;
status = ioctl(fd, SIOCETHTOOL, &req);
if (status < 0) {
- char errbuf[1024];
close(fd);
free(strings);
free(stats);
close(fd);
free(strings);
free(stats);
- ERROR("ethstat plugin: Cannot get strings from %s: %s", device,
- sstrerror(errno, errbuf, sizeof(errbuf)));
+ ERROR("ethstat plugin: Cannot get strings from %s: %s", device, STRERRNO);
return -1;
}
return -1;
}
@@
-266,12
+261,11
@@
static int ethstat_read_interface(char *device) {
req.ifr_data = (void *)stats;
status = ioctl(fd, SIOCETHTOOL, &req);
if (status < 0) {
req.ifr_data = (void *)stats;
status = ioctl(fd, SIOCETHTOOL, &req);
if (status < 0) {
- char errbuf[1024];
close(fd);
free(strings);
free(stats);
ERROR("ethstat plugin: Reading statistics from %s failed: %s", device,
close(fd);
free(strings);
free(stats);
ERROR("ethstat plugin: Reading statistics from %s failed: %s", device,
-
sstrerror(errno, errbuf, sizeof(errbuf))
);
+
STRERRNO
);
return -1;
}
return -1;
}