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 #3207 from dago/cppflagsbugs
[collectd.git]
/
src
/
iptables.c
diff --git
a/src/iptables.c
b/src/iptables.c
index
225ed2c
..
ea2d240
100644
(file)
--- a/
src/iptables.c
+++ b/
src/iptables.c
@@
-26,8
+26,8
@@
#include "collectd.h"
#include "collectd.h"
-#include "common.h"
#include "plugin.h"
#include "plugin.h"
+#include "utils/common/common.h"
#include <libiptc/libip6tc.h>
#include <libiptc/libiptc.h>
#include <libiptc/libip6tc.h>
#include <libiptc/libiptc.h>
@@
-221,8
+221,8
@@
static int submit6_match(const struct ip6t_entry_match *match,
sstrncpy(vl.plugin, "ip6tables", sizeof(vl.plugin));
sstrncpy(vl.plugin, "ip6tables", sizeof(vl.plugin));
- status = snprintf(vl.plugin_instance, sizeof(vl.plugin_instance), "%s-%s",
- chain->table, chain->chain);
+ status = s
s
nprintf(vl.plugin_instance, sizeof(vl.plugin_instance), "%s-%s",
+
chain->table, chain->chain);
if ((status < 1) || ((unsigned int)status >= sizeof(vl.plugin_instance)))
return 0;
if ((status < 1) || ((unsigned int)status >= sizeof(vl.plugin_instance)))
return 0;
@@
-230,8
+230,8
@@
static int submit6_match(const struct ip6t_entry_match *match,
sstrncpy(vl.type_instance, chain->name, sizeof(vl.type_instance));
} else {
if (chain->rule_type == RTYPE_NUM)
sstrncpy(vl.type_instance, chain->name, sizeof(vl.type_instance));
} else {
if (chain->rule_type == RTYPE_NUM)
- snprintf(vl.type_instance, sizeof(vl.type_instance), "%i",
- chain->rule.num);
+ s
s
nprintf(vl.type_instance, sizeof(vl.type_instance), "%i",
+
chain->rule.num);
else
sstrncpy(vl.type_instance, (char *)match->data, sizeof(vl.type_instance));
}
else
sstrncpy(vl.type_instance, (char *)match->data, sizeof(vl.type_instance));
}
@@
-269,8
+269,8
@@
static int submit_match(const struct ipt_entry_match *match,
sstrncpy(vl.plugin, "iptables", sizeof(vl.plugin));
sstrncpy(vl.plugin, "iptables", sizeof(vl.plugin));
- status = snprintf(vl.plugin_instance, sizeof(vl.plugin_instance), "%s-%s",
- chain->table, chain->chain);
+ status = s
s
nprintf(vl.plugin_instance, sizeof(vl.plugin_instance), "%s-%s",
+
chain->table, chain->chain);
if ((status < 1) || ((unsigned int)status >= sizeof(vl.plugin_instance)))
return 0;
if ((status < 1) || ((unsigned int)status >= sizeof(vl.plugin_instance)))
return 0;
@@
-278,8
+278,8
@@
static int submit_match(const struct ipt_entry_match *match,
sstrncpy(vl.type_instance, chain->name, sizeof(vl.type_instance));
} else {
if (chain->rule_type == RTYPE_NUM)
sstrncpy(vl.type_instance, chain->name, sizeof(vl.type_instance));
} else {
if (chain->rule_type == RTYPE_NUM)
- snprintf(vl.type_instance, sizeof(vl.type_instance), "%i",
- chain->rule.num);
+ s
s
nprintf(vl.type_instance, sizeof(vl.type_instance), "%i",
+
chain->rule.num);
else
sstrncpy(vl.type_instance, (char *)match->data, sizeof(vl.type_instance));
}
else
sstrncpy(vl.type_instance, (char *)match->data, sizeof(vl.type_instance));
}