projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #2688 from dstathis/master
[collectd.git]
/
src
/
interface.c
diff --git
a/src/interface.c
b/src/interface.c
index
78a0d69
..
c45ef66
100644
(file)
--- a/
src/interface.c
+++ b/
src/interface.c
@@
-91,6
+91,9
@@
static ignorelist_t *ignorelist = NULL;
static _Bool report_inactive = 1;
#ifdef HAVE_LIBKSTAT
static _Bool report_inactive = 1;
#ifdef HAVE_LIBKSTAT
+#if HAVE_KSTAT_H
+#include <kstat.h>
+#endif
#define MAX_NUMIF 256
extern kstat_ctl_t *kc;
static kstat_t *ksp[MAX_NUMIF];
#define MAX_NUMIF 256
extern kstat_ctl_t *kc;
static kstat_t *ksp[MAX_NUMIF];
@@
-236,9
+239,7
@@
static int interface_read(void) {
int numfields;
if ((fh = fopen("/proc/net/dev", "r")) == NULL) {
int numfields;
if ((fh = fopen("/proc/net/dev", "r")) == NULL) {
- char errbuf[1024];
- WARNING("interface plugin: fopen: %s",
- sstrerror(errno, errbuf, sizeof(errbuf)));
+ WARNING("interface plugin: fopen: %s", STRERRNO);
return -1;
}
return -1;
}
@@
-296,8
+297,8
@@
static int interface_read(void) {
continue;
if (unique_name)
continue;
if (unique_name)
- s
s
nprintf(iname, sizeof(iname), "%s_%d_%s", ksp[i]->ks_module,
-
ksp[i]->ks_instance, ksp[i]->ks_name);
+ snprintf(iname, sizeof(iname), "%s_%d_%s", ksp[i]->ks_module,
+ ksp[i]->ks_instance, ksp[i]->ks_name);
else
sstrncpy(iname, ksp[i]->ks_name, sizeof(iname));
else
sstrncpy(iname, ksp[i]->ks_name, sizeof(iname));
@@
-352,9
+353,7
@@
static int interface_read(void) {
if ((nif = perfstat_netinterface(NULL, NULL, sizeof(perfstat_netinterface_t),
0)) < 0) {
if ((nif = perfstat_netinterface(NULL, NULL, sizeof(perfstat_netinterface_t),
0)) < 0) {
- char errbuf[1024];
- WARNING("interface plugin: perfstat_netinterface: %s",
- sstrerror(errno, errbuf, sizeof(errbuf)));
+ WARNING("interface plugin: perfstat_netinterface: %s", STRERRNO);
return -1;
}
return -1;
}
@@
-367,9
+366,8
@@
static int interface_read(void) {
id.name[0] = '\0';
if ((ifs = perfstat_netinterface(&id, ifstat, sizeof(perfstat_netinterface_t),
nif)) < 0) {
id.name[0] = '\0';
if ((ifs = perfstat_netinterface(&id, ifstat, sizeof(perfstat_netinterface_t),
nif)) < 0) {
- char errbuf[1024];
WARNING("interface plugin: perfstat_netinterface (interfaces=%d): %s", nif,
WARNING("interface plugin: perfstat_netinterface (interfaces=%d): %s", nif,
-
sstrerror(errno, errbuf, sizeof(errbuf))
);
+
STRERRNO
);
return -1;
}
return -1;
}