[master] 35a4eb7 Minor FlexeLintery

[Poul-Henning Kamp]

commit 35a4eb76c13ed891d6dec6a792d8fc4dfcdfc3de
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Fri Apr 28 06:16:08 2017 +0000

    Minor FlexeLintery

diff --git a/bin/varnishncsa/varnishncsa.c b/bin/varnishncsa/varnishncsa.c
index 65ed5c5..1629aa1 100644
--- a/bin/varnishncsa/varnishncsa.c
+++ b/bin/varnishncsa/varnishncsa.c
@@ -436,7 +436,7 @@ addf_string(const char *str)
 	AN(str);
 	ALLOC_OBJ(f, FORMAT_MAGIC);
 	AN(f);
-	f->func = &format_string;
+	f->func = format_string;
 	f->string = strdup(str);
 	AN(f->string);
 	VTAILQ_INSERT_TAIL(&CTX.format, f, list);
@@ -450,7 +450,7 @@ addf_strptr(const char *const *strptr)
 	AN(strptr);
 	ALLOC_OBJ(f, FORMAT_MAGIC);
 	AN(f);
-	f->func = &format_strptr;
+	f->func = format_strptr;
 	f->strptr = strptr;
 	VTAILQ_INSERT_TAIL(&CTX.format, f, list);
 }
@@ -463,7 +463,7 @@ addf_fragment(struct fragment *frag, const char *str)
 	AN(frag);
 	ALLOC_OBJ(f, FORMAT_MAGIC);
 	AN(f);
-	f->func = &format_fragment;
+	f->func = format_fragment;
 	f->frag = frag;
 	if (str != NULL) {
 		f->string = strdup(str);
@@ -480,7 +480,7 @@ addf_int32(int32_t *i)
 	AN(i);
 	ALLOC_OBJ(f, FORMAT_MAGIC);
 	AN(f);
-	f->func = &format_int32;
+	f->func = format_int32;
 	f->int32 = i;
 	VTAILQ_INSERT_TAIL(&CTX.format, f, list);
 }
@@ -492,7 +492,7 @@ addf_time(char type, const char *fmt)
 
 	ALLOC_OBJ(f, FORMAT_MAGIC);
 	AN(f);
-	f->func = &format_time;
+	f->func = format_time;
 	f->time_type = type;
 	if (fmt != NULL) {
 		f->time_fmt = strdup(fmt);
@@ -508,7 +508,7 @@ addf_requestline(void)
 
 	ALLOC_OBJ(f, FORMAT_MAGIC);
 	AN(f);
-	f->func = &format_requestline;
+	f->func = format_requestline;
 	VTAILQ_INSERT_TAIL(&CTX.format, f, list);
 }
 
@@ -527,7 +527,7 @@ addf_vcl_log(const char *key)
 
 	ALLOC_OBJ(f, FORMAT_MAGIC);
 	AN(f);
-	f->func = &format_fragment;
+	f->func = format_fragment;
 	f->frag = &w->frag;
 	f->string = strdup("");
 	AN(f->string);
@@ -550,7 +550,7 @@ addf_hdr(struct watch_head *head, const char *key)
 
 	ALLOC_OBJ(f, FORMAT_MAGIC);
 	AN(f);
-	f->func = &format_fragment;
+	f->func = format_fragment;
 	f->frag = &w->frag;
 	f->string = strdup("-");
 	AN(f->string);
@@ -582,7 +582,7 @@ addf_auth(void)
 
 	ALLOC_OBJ(f, FORMAT_MAGIC);
 	AN(f);
-	f->func = &format_auth;
+	f->func = format_auth;
 	f->string = strdup("-");
 	AN(f->string);
 	VTAILQ_INSERT_TAIL(&CTX.format, f, list);
@@ -1122,6 +1122,7 @@ read_format(const char *formatfile)
 	if (fmtfile == NULL)
 		VUT_Error(1, "Can't open format file (%s)",
 		    strerror(errno));
+	AN(fmtfile);
 	fmtlen = getline(&fmt, &len, fmtfile);
 	if (fmtlen == -1) {
 		free(fmt);
@@ -1185,6 +1186,7 @@ main(int argc, char * const *argv)
 		case 'h':
 			/* Usage help */
 			usage(0);
+			break;
 		case 'w':
 			/* Write to file */
 			REPLACE(CTX.w_arg, optarg);
@@ -1218,7 +1220,7 @@ main(int argc, char * const *argv)
 	format = NULL;
 
 	/* Setup output */
-	VUT.dispatch_f = &dispatch_f;
+	VUT.dispatch_f = dispatch_f;
 	VUT.dispatch_priv = NULL;
 	VUT.sighup_f = sighup;
 	if (CTX.w_arg) {
diff --git a/bin/varnishtop/flint.lnt b/bin/varnishtop/flint.lnt
index aa3e9eb..4d95f0a 100644
--- a/bin/varnishtop/flint.lnt
+++ b/bin/varnishtop/flint.lnt
@@ -1,3 +1,4 @@
+-efile(451, "varnishtop_options.h")
 
 -e712	// 14      Info    712     Loss of precision (___) (___ to ___)
 -e747	// 16      Info    747     Significant prototype coercion (___) ___ to ___
diff --git a/lib/libvarnishapi/vut.c b/lib/libvarnishapi/vut.c
index 7889010..a0df661 100644
--- a/lib/libvarnishapi/vut.c
+++ b/lib/libvarnishapi/vut.c
@@ -157,6 +157,7 @@ VUT_Arg(int opt, const char *arg)
 		return (VUT_g_Arg(arg));
 	case 'k':
 		/* Log transaction limit */
+		AN(arg);
 		VUT.k_arg = (int)strtol(arg, &p, 10);
 		if (*p != '\0' || VUT.k_arg <= 0)
 			VUT_Error(1, "-k: Invalid number '%s'", arg);
@@ -183,6 +184,7 @@ VUT_Arg(int opt, const char *arg)
 		return (1);
 	case 't':
 		/* VSM connect timeout */
+		AN(arg);
 		if (!strcasecmp("off", arg))
 			VUT.t_arg = -1.;
 		else {