X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fethstat.c;h=f0b8d9f01f6d87c779d56e3d95cf0e5b4384b7cb;hb=e1bfa71aca1f37c2f293dc9adb44065c6e7a9ad9;hp=b30f614eab93460d7db4cc87d68d67c71d046b7f;hpb=3fae5596643f1e361eb18c3d65448f8bc02fdd80;p=collectd.git diff --git a/src/ethstat.c b/src/ethstat.c index b30f614e..f0b8d9f0 100644 --- a/src/ethstat.c +++ b/src/ethstat.c @@ -23,9 +23,9 @@ **/ #include "collectd.h" + #include "common.h" #include "plugin.h" -#include "configfile.h" #include "utils_avltree.h" #include "utils_complain.h" @@ -149,9 +149,7 @@ static int ethstat_add_map (const oconfig_item_t *ci) /* {{{ */ static int ethstat_config (oconfig_item_t *ci) /* {{{ */ { - int i; - - for (i = 0; i < ci->children_num; i++) + for (int i = 0; i < ci->children_num; i++) { oconfig_item_t *child = ci->children + i; @@ -174,7 +172,6 @@ static void ethstat_submit_value (const char *device, { static c_complain_t complain_no_map = C_COMPLAIN_INIT_STATIC; - value_t values[1]; value_list_t vl = VALUE_LIST_INIT; value_map_t *map = NULL; @@ -191,8 +188,7 @@ static void ethstat_submit_value (const char *device, return; } - values[0].derive = value; - vl.values = values; + vl.values = &(value_t) { .derive = value }; vl.values_len = 1; sstrncpy (vl.host, hostname_g, sizeof (vl.host)); @@ -221,7 +217,6 @@ static int ethstat_read_interface (char *device) size_t n_stats; size_t strings_size; size_t stats_size; - size_t i; int status; fd = socket(AF_INET, SOCK_DGRAM, /* protocol = */ 0); @@ -311,7 +306,7 @@ static int ethstat_read_interface (char *device) return (-1); } - for (i = 0; i < n_stats; i++) + for (size_t i = 0; i < n_stats; i++) { char *stat_name; @@ -335,9 +330,7 @@ static int ethstat_read_interface (char *device) static int ethstat_read(void) { - size_t i; - - for (i = 0; i < interfaces_num; i++) + for (size_t i = 0; i < interfaces_num; i++) ethstat_read_interface (interfaces[i]); return 0;