projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
collectctl: define LOCALSTATEDIR if not defined
[collectd.git]
/
src
/
write_redis.c
diff --git
a/src/write_redis.c
b/src/write_redis.c
index
4ec75d5
..
4722416
100644
(file)
--- a/
src/write_redis.c
+++ b/
src/write_redis.c
@@
-25,9
+25,9
@@
**/
#include "collectd.h"
**/
#include "collectd.h"
+
#include "plugin.h"
#include "common.h"
#include "plugin.h"
#include "common.h"
-#include "configfile.h"
#include <sys/time.h>
#include <hiredis/hiredis.h>
#include <sys/time.h>
#include <hiredis/hiredis.h>
@@
-167,7
+167,6
@@
static int wr_config_node (oconfig_item_t *ci) /* {{{ */
wr_node_t *node;
int timeout;
int status;
wr_node_t *node;
int timeout;
int status;
- int i;
node = calloc (1, sizeof (*node));
if (node == NULL)
node = calloc (1, sizeof (*node));
if (node == NULL)
@@
-190,7
+189,7
@@
static int wr_config_node (oconfig_item_t *ci) /* {{{ */
return (status);
}
return (status);
}
- 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;
@@
-232,12
+231,13
@@
static int wr_config_node (oconfig_item_t *ci) /* {{{ */
if (status == 0)
{
char cb_name[DATA_MAX_NAME_LEN];
if (status == 0)
{
char cb_name[DATA_MAX_NAME_LEN];
- user_data_t ud;
ssnprintf (cb_name, sizeof (cb_name), "write_redis/%s", node->name);
ssnprintf (cb_name, sizeof (cb_name), "write_redis/%s", node->name);
- ud.data = node;
- ud.free_func = wr_config_free;
+ user_data_t ud = {
+ .data = node,
+ .free_func = wr_config_free
+ };
status = plugin_register_write (cb_name, wr_write, &ud);
}
status = plugin_register_write (cb_name, wr_write, &ud);
}
@@
-250,9
+250,7
@@
static int wr_config_node (oconfig_item_t *ci) /* {{{ */
static int wr_config (oconfig_item_t *ci) /* {{{ */
{
static int wr_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;