require Varnish 5.0.0, and use the new VBM interface

README.rst

@@ -7,8 +7,8 @@ Display Varnish log contents in formats for client, backend and other events
 ----------------------------------------------------------------------------
 
 :Author: Geoffrey Simmons
-:Date:   2016-12-09
-:Version: trunk
+:Date:   2016-12-12
+:Version: 5.0.0
 :Manual section: 1
 
 
@@ -375,9 +375,9 @@ precision.
 REQUIREMENTS
 ============
 
-This version of varnishevent requires Varnish 4.1.3 through 5.0.0.
-See the project repository for versions that are compatible with other
-versions of Varnish.
+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.
 
 
 DATA BUFFERS

configure.ac

 AC_PREREQ(2.59)
 AC_COPYRIGHT([Copyright (c) 2015 UPLEX Nils Goroll Systemoptimierung
 Copyright (c) 2015 Otto Gmbh & Co KG])
-AC_INIT([varnishevent], [trunk])
+AC_INIT([varnishevent], [5.0.0])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_SRCDIR(src/varnishevent.h)
 AM_CONFIG_HEADER(config.h)
@@ -52,8 +52,8 @@ AM_CONDITIONAL(HAVE_RST2HTML,[test "x$RST2HTML" != "xno"])
 # Check for pkg-config
 PKG_PROG_PKG_CONFIG
 
-PKG_CHECK_MODULES([VARNISH], [varnishapi >= 4.1.3 varnishapi <= 5.0.0], [],
-                  [AC_MSG_ERROR([Varnish 4.1.3 through 5.0.0 is required])])
+PKG_CHECK_MODULES([VARNISH], [varnishapi = 5.0.0], [],
+                  [AC_MSG_ERROR([Varnish 5.0.0 is required])])
 AC_SUBST(VARNISH_CFLAGS)
 AC_SUBST(VARNISH_LIBS)
 PKG_CHECK_VAR([VARNISH_PKG_INCLUDE], [varnishapi], [pkgincludedir])

src/format.c

@@ -1035,7 +1035,7 @@ compile_fmt(char * const format, compiled_fmt_t * const fmt,
         fmt->args[i].hdr_idx = -1;
 
     nonrecs_wanted[type] = 0;
-    tag_no_hdr[type] = vbit_init(MAX_VSL_TAG);
+    tag_no_hdr[type] = vbit_new(MAX_VSL_TAG);
 
     n = 0;
     os = VSB_new_auto();
@@ -1583,6 +1583,10 @@ FMT_Fini(void)
             hdr_trie[i] = NULL;
         }
 
+    for (int i = 0; i < VSL_t__MAX; i++)
+        if (tag_no_hdr[i] != NULL)
+            vbit_destroy(tag_no_hdr[i]);
+
     if (!VSB_EMPTY(config.cformat))
         free_format(&cformat);
     if (!VSB_EMPTY(config.bformat))