[master] 79c2d96 Minor cleanups from FlexeLint

Poul-Henning Kamp phk at varnish-cache.org
Tue Mar 29 11:36:06 CEST 2011


commit 79c2d962221bb7ce3582caa1a0be5df4841e0832
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Tue Mar 29 09:35:56 2011 +0000

    Minor cleanups from FlexeLint

diff --git a/bin/varnishncsa/flint.lnt b/bin/varnishncsa/flint.lnt
index 7614a7e..ce8b3f4 100644
--- a/bin/varnishncsa/flint.lnt
+++ b/bin/varnishncsa/flint.lnt
@@ -33,4 +33,5 @@
 -e557	// unrecog format
 -e732   // Loss of sign (arg. no. 2) (int to unsigned
 -e737	// [45]  Loss of sign in promotion from int to unsigned
+-e788	// tag not used in defaulted switch
 
diff --git a/bin/varnishncsa/flint.sh b/bin/varnishncsa/flint.sh
index 8b65b9f..f7d7988 100755
--- a/bin/varnishncsa/flint.sh
+++ b/bin/varnishncsa/flint.sh
@@ -4,6 +4,7 @@ T=/tmp/_$$
 flexelint \
 	-I/usr/include \
 	-I. \
+	-I../.. \
 	-I../../include \
 	../flint.lnt \
 	flint.lnt \
diff --git a/bin/varnishncsa/varnishncsa.c b/bin/varnishncsa/varnishncsa.c
index 396111c..8367ba4 100644
--- a/bin/varnishncsa/varnishncsa.c
+++ b/bin/varnishncsa/varnishncsa.c
@@ -65,14 +65,12 @@
 SVNID("$Id$")
 
 #include <ctype.h>
-#include <errno.h>
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <time.h>
+#include <strings.h>
 #include <unistd.h>
-#include <limits.h>
 
 #include "compat/daemon.h"
 
@@ -112,7 +110,7 @@ static size_t nll;
 
 static int o_flag = 0;
 static int match_tag;
-static vre_t *match_tag_re;
+static const vre_t *match_tag_re;
 
 static const char *format;
 
@@ -677,6 +675,7 @@ h_ncsa(void *priv, enum vsl_tag tag, unsigned fd,
 				}
 			}
 			/* Fall through if we haven't handled something */
+			/* FALLTHROUGH*/
 		default:
 			fprintf(stderr, "Unknown format character: %c\n", *p);
 			exit(1);



More information about the varnish-commit mailing list