projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'pr/1649'
[collectd.git]
/
src
/
ethstat.c
diff --git
a/src/ethstat.c
b/src/ethstat.c
index
39af140
..
f0b8d9f
100644
(file)
--- a/
src/ethstat.c
+++ b/
src/ethstat.c
@@
-26,7
+26,6
@@
#include "common.h"
#include "plugin.h"
#include "common.h"
#include "plugin.h"
-#include "configfile.h"
#include "utils_avltree.h"
#include "utils_complain.h"
#include "utils_avltree.h"
#include "utils_complain.h"
@@
-150,9
+149,7
@@
static int ethstat_add_map (const oconfig_item_t *ci) /* {{{ */
static int ethstat_config (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;
{
oconfig_item_t *child = ci->children + i;
@@
-175,7
+172,6
@@
static void ethstat_submit_value (const char *device,
{
static c_complain_t complain_no_map = C_COMPLAIN_INIT_STATIC;
{
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;
value_list_t vl = VALUE_LIST_INIT;
value_map_t *map = NULL;
@@
-192,8
+188,7
@@
static void ethstat_submit_value (const char *device,
return;
}
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));
vl.values_len = 1;
sstrncpy (vl.host, hostname_g, sizeof (vl.host));
@@
-222,7
+217,6
@@
static int ethstat_read_interface (char *device)
size_t n_stats;
size_t strings_size;
size_t stats_size;
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);
int status;
fd = socket(AF_INET, SOCK_DGRAM, /* protocol = */ 0);
@@
-312,7
+306,7
@@
static int ethstat_read_interface (char *device)
return (-1);
}
return (-1);
}
- for (i = 0; i < n_stats; i++)
+ for (
size_t
i = 0; i < n_stats; i++)
{
char *stat_name;
{
char *stat_name;
@@
-336,9
+330,7
@@
static int ethstat_read_interface (char *device)
static int ethstat_read(void)
{
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;
ethstat_read_interface (interfaces[i]);
return 0;