Monday morning flexelinting & whitespace OCD

bin/varnishd/cache/cache_vcl.c

@@ -52,7 +52,7 @@ const struct vcltemp VCL_TEMP_BUSY[1] = {{ .name = "busy", .is_warm = 1 }};
 const struct vcltemp VCL_TEMP_COOLING[1] = {{ .name = "cooling" }};
 
 // not really a temperature
-const struct vcltemp VCL_TEMP_LABEL[1] = {{ .name = "label" }};
+static const struct vcltemp VCL_TEMP_LABEL[1] = {{ .name = "label" }};
 
 /*
  * XXX: Presently all modifications to this list happen from the

bin/varnishd/cache/cache_vcl.h

@@ -32,7 +32,7 @@
  */
 
 struct vfilter;
-struct vcltemp;;
+struct vcltemp;
 
 VTAILQ_HEAD(vfilter_head, vfilter);
 

bin/varnishd/flint.lnt

@@ -146,6 +146,8 @@
 
 // cache_vcl.c
 -esym(528, vcl_call_method)	// Not referenced
+-esym(765, VCL_TEMP_*)
+-esym(759, VCL_TEMP_*)
 
 -e441	//  for clause irregularity: loop variable '___' not found in 2nd for expression
 

bin/varnishtest/tests/r02872.vtc

@@ -16,8 +16,7 @@ varnish v1 -vcl {
 		std.log({"  custom   log     "ok" "});
 		std.log({" "valid"  "fields"  ok "});
 		std.log({" "missing""blank"   ko "});
-		std.log({"  missing  dquote  "ko "});
-		# "
+		std.log({"  missing  dquote  "ko "});	# "
 		return (synth(200));
 	}
 } -start

lib/libvmod_vtc/vmod_vtc.c

@@ -297,6 +297,7 @@ vmod_typesize(VRT_CTX, VCL_STRING s)
 			i += (l - a); /* align */
 		i += l;
 	}
+	AN(p);
 	a = i % p;
 	if (a != 0)
 		i += (p - a); /* pad */