do not link with libvarnish (which is no longer shared)

README.rst

@@ -375,9 +375,10 @@ precision.
 REQUIREMENTS
 ============
 
-This version of varnishevent requires Varnish 5.0.0 (exactly that
-version and no other). See the project repository for versions that
-are compatible with other versions of Varnish.
+This version of varnishevent requires the Varnish trunk since commit
+``d0bba14``; it is not currently compatible with any released version
+of Varnish. See the project repository for versions that are
+compatible with other versions of Varnish.
 
 
 DATA BUFFERS

src/Makefile.am

@@ -36,8 +36,7 @@ varnishevent_SOURCES = \
 	hdrtrie.c
 
 varnishevent_LDADD = \
-	${PTHREAD_LIBS} ${RT_LIBS} ${LIBM} @VARNISH_LIBS@ \
-	-L${VARNISH_PKG_LIB}/varnish -lvarnish
+	${PTHREAD_LIBS} ${RT_LIBS} ${LIBM} @VARNISH_LIBS@
 
 # from Varnish include/Makefile.am
 BUILT_SOURCES = vcs_version.h

src/format.c

@@ -1365,7 +1365,7 @@ compile_fmt(char * const format, compiled_fmt_t * const fmt,
      */
     VSB_putc(os, '\n');
     add_formatter(fmt, os, n, NULL);
-    VSB_delete(os);
+    VSB_destroy(&os);
     return 0;
 }
 
@@ -1570,7 +1570,7 @@ void
 FMT_Fini(void)
 {
     free(obuf);
-    VSB_delete(scratch);
+    VSB_destroy(&scratch);
     free(payload);
 
     free_incl(cincl);

src/hdrtrie.c

@@ -197,7 +197,7 @@ hdr_traverse(struct hdrt_node *hdrt, struct vsb *sb, struct vsb *prefix)
         VSB_finish(word);
         VSB_cat(sb, VSB_data(word));
         VSB_cat(sb, ",");
-        VSB_delete(word);
+        VSB_destroy(&word);
     }
     for (int i = 0; i < 64; i++)
         if (hdrt->next[i] != NULL) {
@@ -208,7 +208,7 @@ hdr_traverse(struct hdrt_node *hdrt, struct vsb *sb, struct vsb *prefix)
             VSB_putc(next, toupper(c));
             hdr_traverse(hdrt->next[i], sb, next);
         }
-    VSB_delete(current);
+    VSB_destroy(&current);
 }
 
 void

src/test/Makefile.am

@@ -20,7 +20,7 @@ test_data_LDADD = \
 	../format.$(OBJEXT) \
 	../strfTIM.$(OBJEXT) \
 	../hdrtrie.$(OBJEXT) \
-	@VARNISH_LIBS@ @VARNISH_LIBVARNISH_LIB@ ${LIBM} -lvarnish
+	@VARNISH_LIBS@ @VARNISH_LIBVARNISH_LIB@ ${LIBM}
 
 test_format_SOURCES = \
 	minunit.h \
@@ -33,7 +33,7 @@ test_format_LDADD = \
 	../data.$(OBJEXT) \
 	../hdrtrie.$(OBJEXT) \
 	../format.$(OBJEXT) \
-	@VARNISH_LIBS@ @VARNISH_LIBVARNISH_LIB@ ${LIBM} -lvarnish
+	@VARNISH_LIBS@ @VARNISH_LIBVARNISH_LIB@ ${LIBM}
 
 test_writer_SOURCES = \
 	minunit.h \
@@ -50,7 +50,7 @@ test_writer_LDADD = \
 	../strfTIM.$(OBJEXT) \
 	../hdrtrie.$(OBJEXT) \
 	../writer.$(OBJEXT) \
-	@VARNISH_LIBS@ @VARNISH_LIBVARNISH_LIB@ ${LIBM} -lvarnish
+	@VARNISH_LIBS@ @VARNISH_LIBVARNISH_LIB@ ${LIBM}
 
 test_strfTIM_SOURCES = \
 	minunit.h \
@@ -59,7 +59,7 @@ test_strfTIM_SOURCES = \
 
 test_strfTIM_LDADD = \
 	../strfTIM.$(OBJEXT) \
-	@VARNISH_LIBS@  @VARNISH_LIBVARNISH_LIB@ ${LIBM} -lvarnish
+	@VARNISH_LIBS@  @VARNISH_LIBVARNISH_LIB@ ${LIBM}
 
 test_hdrtrie_SOURCES = \
 	minunit.h \
@@ -68,4 +68,4 @@ test_hdrtrie_SOURCES = \
 
 test_hdrtrie_LDADD = \
 	../hdrtrie.$(OBJEXT) \
-	@VARNISH_LIBS@  @VARNISH_LIBVARNISH_LIB@ ${LIBM} -lvarnish
+	@VARNISH_LIBS@  @VARNISH_LIBVARNISH_LIB@ ${LIBM}

src/test/test_hdrtrie.c

@@ -512,7 +512,7 @@ static char
     MASSERT(strcasecmp(VSB_data(sb), EXP) == 0);
 #undef EXP
 
-    VSB_delete(sb);
+    VSB_destroy(&sb);
 
     return NULL;
 }

src/varnishevent.c

@@ -890,7 +890,7 @@ main(int argc, char *argv[])
             VSB_finish(hdrs);
             LOG_Log(LOG_INFO, "Reading tags %s with headers: %s", VSL_tags[i],
                     VSB_data(hdrs));
-            VSB_delete(hdrs);
+            VSB_destroy(&hdrs);
         }
     }