[5.2] c63f2f3 Flexelintery

[PÃ¥l Hermunn Johansen]

commit c63f2f335d1dc033dcc30b2d761f8cbaae572895
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Tue Sep 12 04:38:32 2017 +0000

    Flexelintery

diff --git a/flint.lnt b/flint.lnt
index 3fa3bf4..aab7299 100644
--- a/flint.lnt
+++ b/flint.lnt
@@ -39,6 +39,8 @@
 -e785		// Too few initializers for aggregate
 -e786		// String concatenation within initializer
 
+-e788		// enum constant '___' not used within defaulted switch
+
 -esym(818, argv)	// Pointer parameter '...' could be declared as pointing to const
 
 /*
@@ -75,6 +77,8 @@
 -esym(534, sleep)
 -esym(534, usleep)
 
+-esym(768, vmod_priv)	// global struct member '___' (___) not referenced
+
 ///////////////////////////////////////////////////////////////////////
 // <vas.h>
 
diff --git a/lib/libvmod_vtc/vmod_vtc.c b/lib/libvmod_vtc/vmod_vtc.c
index e1afcf8..9fd3fc4 100644
--- a/lib/libvmod_vtc/vmod_vtc.c
+++ b/lib/libvmod_vtc/vmod_vtc.c
@@ -187,7 +187,7 @@ vmod_workspace_##name(VRT_CTX, VCL_ENUM which)		\
 							\
 	op;						\
 }
-VTC_WS_OP(VOID, snapshot, vtc_ws_snapshot = WS_Snapshot(ws))
+VTC_WS_OP(VOID, snapshot, (vtc_ws_snapshot = WS_Snapshot(ws)))
 VTC_WS_OP(VOID, reset, WS_Reset(ws, vtc_ws_snapshot))
 VTC_WS_OP(VOID, overflow, WS_MarkOverflow(ws))
 VTC_WS_OP(BOOL, overflowed, return (WS_Overflowed(ws)))
@@ -198,7 +198,7 @@ VTC_WS_OP(BOOL, overflowed, return (WS_Overflowed(ws)))
 VCL_INT __match_proto__(td_vtc_typesize)
 vmod_typesize(VRT_CTX, VCL_STRING s)
 {
-	VCL_INT i = 0;
+	size_t i = 0;
 	const char *p;
 
 	CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
@@ -219,5 +219,5 @@ vmod_typesize(VRT_CTX, VCL_STRING s)
 		default:	return (-1);
 		}
 	}
-	return (i);
+	return ((VCL_INT)i);
 }