X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fvarnish.c;h=c6c4df05d413b97fe2ee1de80d81b3c42f29e2e1;hb=8eb05d21637cd1eb3b6c4c4d3ed519cc2fd3ebf6;hp=b96226105cfe31222e99a4c126c4390c7c04808f;hpb=f8428bc38227584fdccd9f4eddc7c80a0ca8479b;p=collectd.git

diff --git a/src/varnish.c b/src/varnish.c
index b9622610..c6c4df05 100644
--- a/src/varnish.c
+++ b/src/varnish.c
@@ -29,19 +29,19 @@
 #include "configfile.h"
 
 #if HAVE_VARNISH_V4
-#include <varnish/vapi/vsm.h>
-#include <varnish/vapi/vsc.h>
+#include <vapi/vsm.h>
+#include <vapi/vsc.h>
 typedef struct VSC_C_main c_varnish_stats_t;
 #endif
 
 #if HAVE_VARNISH_V3
-#include <varnish/varnishapi.h>
-#include <varnish/vsc.h>
+#include <varnishapi.h>
+#include <vsc.h>
 typedef struct VSC_C_main c_varnish_stats_t;
 #endif
 
 #if HAVE_VARNISH_V2
-#include <varnish/varnishapi.h>
+#include <varnishapi.h>
 typedef struct varnish_stats c_varnish_stats_t;
 #endif
 
@@ -643,7 +643,7 @@ static int varnish_read (user_data_t *ud) /* {{{ */
 
 
 	varnish_monitor (conf, stats);
-	VSM_Close (vd);
+	VSM_Delete (vd);
 
 	return (0);
 } /* }}} */
@@ -749,7 +749,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);
@@ -911,7 +911,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;