projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
processes plugin: fix 3 compiler warnings on OS X
[collectd.git]
/
src
/
varnish.c
diff --git
a/src/varnish.c
b/src/varnish.c
index
863f497
..
6cc092c
100644
(file)
--- a/
src/varnish.c
+++ b/
src/varnish.c
@@
-27,7
+27,6
@@
#include "common.h"
#include "plugin.h"
#include "common.h"
#include "plugin.h"
-#include "configfile.h"
#if HAVE_VARNISH_V4
#include <vapi/vsm.h>
#if HAVE_VARNISH_V4
#include <vapi/vsm.h>
@@
-939,7
+938,6
@@
static int varnish_config_apply_default (user_config_t *conf) /* {{{ */
static int varnish_init (void) /* {{{ */
{
user_config_t *conf;
static int varnish_init (void) /* {{{ */
{
user_config_t *conf;
- user_data_t ud;
if (have_instance)
return (0);
if (have_instance)
return (0);
@@
-953,8
+951,10
@@
static int varnish_init (void) /* {{{ */
varnish_config_apply_default (conf);
varnish_config_apply_default (conf);
- ud.data = conf;
- ud.free_func = varnish_config_free;
+ user_data_t ud = {
+ .data = conf,
+ .free_func = varnish_config_free
+ };
plugin_register_complex_read (/* group = */ "varnish",
/* name = */ "varnish/localhost",
plugin_register_complex_read (/* group = */ "varnish",
/* name = */ "varnish/localhost",
@@
-970,7
+970,6
@@
static int varnish_config_instance (const oconfig_item_t *ci) /* {{{ */
user_config_t *conf;
user_data_t ud;
char callback_name[DATA_MAX_NAME_LEN];
user_config_t *conf;
user_data_t ud;
char callback_name[DATA_MAX_NAME_LEN];
- int i;
conf = calloc (1, sizeof (*conf));
if (conf == NULL)
conf = calloc (1, sizeof (*conf));
if (conf == NULL)
@@
-1005,7
+1004,7
@@
static int varnish_config_instance (const oconfig_item_t *ci) /* {{{ */
return (EINVAL);
}
return (EINVAL);
}
- 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;
@@
-1149,9
+1148,7
@@
static int varnish_config_instance (const oconfig_item_t *ci) /* {{{ */
static int varnish_config (oconfig_item_t *ci) /* {{{ */
{
static int varnish_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;