[master] 8b9770e Minor FlexeLintery

Poul-Henning Kamp phk at FreeBSD.org
Mon Aug 14 23:50:10 CEST 2017


commit 8b9770eebc956420a61d17dbae79ca5230a83c70
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon Aug 14 21:48:54 2017 +0000

    Minor FlexeLintery

diff --git a/lib/libvcc/vcc_acl.c b/lib/libvcc/vcc_acl.c
index 0a6a15a..3fcc333 100644
--- a/lib/libvcc/vcc_acl.c
+++ b/lib/libvcc/vcc_acl.c
@@ -448,14 +448,13 @@ vcc_acl_emit(struct vcc *tl, const char *name, const char *rname, int anon)
 		Fh(tl, 0, "\tVRT_acl_log(ctx, \"NO_MATCH %s\");\n", name);
 	Fh(tl, 0, "\treturn (0);\n}\n");
 
-	if (anon)
-		return;
-
-	/* Emit the struct that will be referenced */
-	Fh(tl, 0, "\nconst struct vrt_acl %s[] = {{\n", rname);
-	Fh(tl, 0, "\t.magic = VRT_ACL_MAGIC,\n");
-	Fh(tl, 0, "\t.match = &%s,\n", VSB_data(func));
-	Fh(tl, 0, "}};\n\n");
+	if (!anon) {
+		/* Emit the struct that will be referenced */
+		Fh(tl, 0, "\nconst struct vrt_acl %s[] = {{\n", rname);
+		Fh(tl, 0, "\t.magic = VRT_ACL_MAGIC,\n");
+		Fh(tl, 0, "\t.match = &%s,\n", VSB_data(func));
+		Fh(tl, 0, "}};\n\n");
+	}
 	VSB_destroy(&func);
 }
 
diff --git a/lib/libvcc/vcc_var.c b/lib/libvcc/vcc_var.c
index 4e69db2..ea69923 100644
--- a/lib/libvcc/vcc_var.c
+++ b/lib/libvcc/vcc_var.c
@@ -33,7 +33,6 @@
 #include <string.h>
 
 #include "vcc_compile.h"
-#include "vct.h"
 
 /*--------------------------------------------------------------------*/
 
diff --git a/lib/libvcc/vcc_vmod.c b/lib/libvcc/vcc_vmod.c
index 06ca562..64b5564 100644
--- a/lib/libvcc/vcc_vmod.c
+++ b/lib/libvcc/vcc_vmod.c
@@ -35,8 +35,6 @@
 
 #include "vcc_compile.h"
 
-#include "vcs_version.h"
-
 #include "libvcc.h"
 #include "vfil.h"
 #include "vmod_abi.h"



More information about the varnish-commit mailing list