projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
contrib/docker: add LD_PRELOAD wrapper to fopen/open/opendir syscalls
[collectd.git]
/
src
/
routeros.c
diff --git
a/src/routeros.c
b/src/routeros.c
index
7ee3024
..
5e8a294
100644
(file)
--- a/
src/routeros.c
+++ b/
src/routeros.c
@@
-25,6
+25,7
@@
**/
#include "collectd.h"
**/
#include "collectd.h"
+
#include "common.h"
#include "plugin.h"
#include "common.h"
#include "plugin.h"
@@
-51,11
+52,11
@@
typedef struct cr_data_s cr_data_t;
static void cr_submit_io (cr_data_t *rd, const char *type, /* {{{ */
const char *type_instance, derive_t rx, derive_t tx)
{
static void cr_submit_io (cr_data_t *rd, const char *type, /* {{{ */
const char *type_instance, derive_t rx, derive_t tx)
{
- value_t values[2];
value_list_t vl = VALUE_LIST_INIT;
value_list_t vl = VALUE_LIST_INIT;
-
- values[0].derive = rx;
- values[1].derive = tx;
+ value_t values[] = {
+ { .derive = rx },
+ { .derive = tx },
+ };
vl.values = values;
vl.values_len = STATIC_ARRAY_SIZE (values);
vl.values = values;
vl.values_len = STATIC_ARRAY_SIZE (values);
@@
-324,9
+325,7
@@
static int cr_config_router (oconfig_item_t *ci) /* {{{ */
{
cr_data_t *router_data;
char read_name[128];
{
cr_data_t *router_data;
char read_name[128];
- user_data_t user_data;
int status;
int status;
- int i;
router_data = calloc (1, sizeof (*router_data));
if (router_data == NULL)
router_data = calloc (1, sizeof (*router_data));
if (router_data == NULL)
@@
-338,7
+337,7
@@
static int cr_config_router (oconfig_item_t *ci) /* {{{ */
router_data->password = NULL;
status = 0;
router_data->password = NULL;
status = 0;
- for (i = 0; i < ci->children_num; i++)
+ for (i
nt i
= 0; i < ci->children_num; i++)
{
oconfig_item_t *child = ci->children + i;
{
oconfig_item_t *child = ci->children + i;
@@
-409,11
+408,12
@@
static int cr_config_router (oconfig_item_t *ci) /* {{{ */
}
ssnprintf (read_name, sizeof (read_name), "routeros/%s", router_data->node);
}
ssnprintf (read_name, sizeof (read_name), "routeros/%s", router_data->node);
- user_data.data = router_data;
- user_data.free_func = (void *) cr_free_data;
if (status == 0)
status = plugin_register_complex_read (/* group = */ NULL, read_name,
if (status == 0)
status = plugin_register_complex_read (/* group = */ NULL, read_name,
- cr_read, /* interval = */ 0, &user_data);
+ cr_read, /* interval = */ 0, &(user_data_t) {
+ .data = router_data,
+ .free_func = (void *) cr_free_data,
+ });
if (status != 0)
cr_free_data (router_data);
if (status != 0)
cr_free_data (router_data);
@@
-423,9
+423,7
@@
static int cr_config_router (oconfig_item_t *ci) /* {{{ */
static int cr_config (oconfig_item_t *ci)
{
static int cr_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;