Merge remote-tracking branch 'github/pr/1952'

[collectd.git] / src / pf.c

diff --git a/src/pf.c b/src/pf.c
index 42679fe..ecaa869 100644 (file)
--- a/src/pf.c
+++ b/src/pf.c
@@ -20,6 +20,7 @@
  */
 
 #include "collectd.h"
+
 #include "plugin.h"
 #include "common.h"
 
@@ -69,7 +70,6 @@ static void pf_submit (char const *type, char const *type_instance,
 
        vl.values = values;
        vl.values_len = 1;
-       sstrncpy (vl.host, hostname_g, sizeof (vl.host));
        sstrncpy (vl.plugin, "pf", sizeof (vl.plugin));
        sstrncpy (vl.type, type, sizeof(vl.type));
        sstrncpy (vl.type_instance, type_instance, sizeof(vl.type_instance));
@@ -79,10 +79,9 @@ static void pf_submit (char const *type, char const *type_instance,
 
 static int pf_read (void)
 {
-       struct pf_status state = { 0 };
+       struct pf_status state;
        int fd;
        int status;
-       int i;
 
        fd = open (pf_device, O_RDONLY);
        if (fd < 0)
@@ -112,16 +111,16 @@ static int pf_read (void)
                return (-1);
        }
 
-       for (i = 0; i < PFRES_MAX; i++)
+       for (int i = 0; i < PFRES_MAX; i++)
                pf_submit ("pf_counters", pf_reasons[i], state.counters[i],
                                /* is gauge = */ 0);
-       for (i = 0; i < LCNT_MAX; i++)
+       for (int i = 0; i < LCNT_MAX; i++)
                pf_submit ("pf_limits", pf_lcounters[i], state.lcounters[i],
                                /* is gauge = */ 0);
-       for (i = 0; i < FCNT_MAX; i++)
+       for (int i = 0; i < FCNT_MAX; i++)
                pf_submit ("pf_state", pf_fcounters[i], state.fcounters[i],
                                /* is gauge = */ 0);
-       for (i = 0; i < SCNT_MAX; i++)
+       for (int i = 0; i < SCNT_MAX; i++)
                pf_submit ("pf_source", pf_scounters[i], state.scounters[i],
                                /* is gauge = */ 0);