Merge branch 'collectd-5.4' into collectd-5.5

[collectd.git] / src / varnish.c

diff --git a/src/varnish.c b/src/varnish.c
index cd52217..a138d18 100644 (file)
--- 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)
@@ -1003,6 +1000,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 +1108,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);
        }