X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fvarnish.c;h=aee72471a4d6b62d8e8d13266b47e8ff742b34a0;hb=0d9a0eb065fda6f89fc597e760ae56edd47337d9;hp=cd5221785805f813df12b91caa4703ee66ebf146;hpb=d010d9eff882765201359959a583033dae4b373c;p=collectd.git

diff --git a/src/varnish.c b/src/varnish.c
index cd522178..aee72471 100644
--- a/src/varnish.c
+++ b/src/varnish.c
@@ -141,7 +141,6 @@ static int varnish_monitor (void *priv, const struct VSC_point * const pt) /* {{
 	uint64_t val;
 	const user_config_t *conf;
 	const char *class;
-	const char *ident;
 	const char *name;
 
 	if (pt == NULL)
@@ -151,7 +150,6 @@ static int varnish_monitor (void *priv, const struct VSC_point * const pt) /* {{
 
 #if HAVE_VARNISH_V4
 	class = pt->section->fantom->type;
-	ident = pt->section->fantom->ident;
 	name  = pt->desc->name;
 
 	if (strcmp(class, "MAIN") != 0)
@@ -159,7 +157,6 @@ static int varnish_monitor (void *priv, const struct VSC_point * const pt) /* {{
 
 #elif HAVE_VARNISH_V3
 	class = pt->class;
-	ident = pt->ident;
 	name  = pt->name;
 
 	if (strcmp(class, "") != 0)
@@ -796,6 +793,7 @@ static int varnish_read (user_data_t *ud) /* {{{ */
 {
 	struct VSM_data *vd;
 	const c_varnish_stats_t *stats;
+	_Bool ok;
 
 	user_config_t *conf;
 
@@ -825,10 +823,11 @@ static int varnish_read (user_data_t *ud) /* {{{ */
 	}
 
 #if HAVE_VARNISH_V3
-	if (VSC_Open (vd, /* diag = */ 1))
+	ok = (VSC_Open (vd, /* diag = */ 1) == 0);
 #else /* if HAVE_VARNISH_V4 */
-	if (VSM_Open (vd))
+	ok = (VSM_Open (vd) == 0);
 #endif
+	if (!ok)
 	{
 		VSM_Delete (vd);
 		ERROR ("varnish plugin: Unable to open connection.");
@@ -960,7 +959,7 @@ static int varnish_init (void) /* {{{ */
 	plugin_register_complex_read (/* group = */ "varnish",
 			/* name      = */ "varnish/localhost",
 			/* callback  = */ varnish_read,
-			/* interval  = */ NULL,
+			/* interval  = */ 0,
 			/* user data = */ &ud);
 
 	return (0);
@@ -1003,6 +1002,7 @@ static int varnish_config_instance (const oconfig_item_t *ci) /* {{{ */
 	{
 		WARNING ("Varnish plugin: \"Instance\" blocks accept only "
 				"one argument.");
+		sfree (conf);
 		return (EINVAL);
 	}
 
@@ -1110,6 +1110,7 @@ static int varnish_config_instance (const oconfig_item_t *ci) /* {{{ */
 		WARNING ("Varnish plugin: No metric has been configured for "
 				"instance \"%s\". Disabling this instance.",
 				(conf->instance == NULL) ? "localhost" : conf->instance);
+		sfree (conf);
 		return (EINVAL);
 	}
 
@@ -1122,7 +1123,7 @@ static int varnish_config_instance (const oconfig_item_t *ci) /* {{{ */
 	plugin_register_complex_read (/* group = */ "varnish",
 			/* name      = */ callback_name,
 			/* callback  = */ varnish_read,
-			/* interval  = */ NULL,
+			/* interval  = */ 0,
 			/* user data = */ &ud);
 
 	have_instance = 1;