r4901 - in trunk/varnish-cache/bin: . varnishd varnishncsa varnishtest

[phk at varnish-cache.org]

Author: phk
Date: 2010-06-05 15:03:56 +0200 (Sat, 05 Jun 2010)
New Revision: 4901

Added:
   trunk/varnish-cache/bin/flint.lnt
Modified:
   trunk/varnish-cache/bin/varnishd/flint.lnt
   trunk/varnish-cache/bin/varnishd/flint.sh
   trunk/varnish-cache/bin/varnishd/vclflint.lnt
   trunk/varnish-cache/bin/varnishncsa/flint.lnt
   trunk/varnish-cache/bin/varnishncsa/flint.sh
   trunk/varnish-cache/bin/varnishtest/flint.lnt
   trunk/varnish-cache/bin/varnishtest/flint.sh
Log:
Start unifying FlexeLint instructions, to curb spreading copy&paste-itis



Added: trunk/varnish-cache/bin/flint.lnt
===================================================================
--- trunk/varnish-cache/bin/flint.lnt	                        (rev 0)
+++ trunk/varnish-cache/bin/flint.lnt	2010-06-05 13:03:56 UTC (rev 4901)
@@ -0,0 +1,12 @@
+-passes=3
+
+///////////////////////////////////////////////////////////////////////
+// ../../config.h magic
+-header(../../config.h)
++libh ../../config.h
+-efile(451, ../../config.h)
+
+
+///////////////////////////////////////////////////////////////////////
+// assert() support, common to libvarnish and libvarnishapi
+-sem(vas_fail, r_no)

Modified: trunk/varnish-cache/bin/varnishd/flint.lnt
===================================================================
--- trunk/varnish-cache/bin/varnishd/flint.lnt	2010-06-05 12:51:33 UTC (rev 4900)
+++ trunk/varnish-cache/bin/varnishd/flint.lnt	2010-06-05 13:03:56 UTC (rev 4901)
@@ -1,4 +1,3 @@
-
 -d__flexelint_v9__=1
 
 -libdir(../../include)
@@ -75,7 +74,6 @@
 -e777	// float equality comparison
 -e679	// Suspicious Truncation in arithmetic expression combining with pointer
 
--esym(458, lbv_assert)	// unlocked access
 -esym(458, params)	// unlocked access
 
 -emacro(835, HTTPH)	// Info 835: A zero has been given as left argument to operator '&'
@@ -109,10 +107,8 @@
 -esym(528, svnid)
 
 //////////////
--passes=3
 
 +libh mgt_event.h
-+libh ../../config.h
 
 -emacro((???),va_arg)   // the va_arg() macro can yield 415, 416, 661, 662
                         // 796 and 797 (out-of-bounds errors).
@@ -128,7 +124,6 @@
 
 
 
-// -header(../../config.h)
 
 // Fix strchr() semtics, it can only return NULL if arg2 != 0
 -sem(strchr, 1p, type(1), 2n == 0 ? (@p < 1p) : (@p < 1p || @p == 0 ))
@@ -136,8 +131,6 @@
 -sem(vsb_new, @p == (1p ? 1p : malloc(1)))
 -sem(vsb_delete, custodial(1))
 -sem(pthread_create, custodial(4))
--sem(lbv_assert, r_no)
--sem(lbv_xxxassert, r_no)
 -sem(WS_Init, custodial(2))
 -sem(http_Setup, custodial(2))
 

Modified: trunk/varnish-cache/bin/varnishd/flint.sh
===================================================================
--- trunk/varnish-cache/bin/varnishd/flint.sh	2010-06-05 12:51:33 UTC (rev 4900)
+++ trunk/varnish-cache/bin/varnishd/flint.sh	2010-06-05 13:03:56 UTC (rev 4901)
@@ -1,6 +1,7 @@
 #!/bin/sh
 
 flexelint \
+	../flint.lnt \
 	flint.lnt \
 	-I. \
 	-I../../include \

Modified: trunk/varnish-cache/bin/varnishd/vclflint.lnt
===================================================================
--- trunk/varnish-cache/bin/varnishd/vclflint.lnt	2010-06-05 12:51:33 UTC (rev 4900)
+++ trunk/varnish-cache/bin/varnishd/vclflint.lnt	2010-06-05 13:03:56 UTC (rev 4901)
@@ -1,8 +1,6 @@
 // Flexelint configuration file for VCL compiler output
 //
 
--passes=3
-
 -esym(763, sess)	// Redundant declaration for symbol 'sess'
 			// Harmless
 

Modified: trunk/varnish-cache/bin/varnishncsa/flint.lnt
===================================================================
--- trunk/varnish-cache/bin/varnishncsa/flint.lnt	2010-06-05 12:51:33 UTC (rev 4900)
+++ trunk/varnish-cache/bin/varnishncsa/flint.lnt	2010-06-05 13:03:56 UTC (rev 4901)
@@ -1,7 +1,4 @@
--passes=3
 
--header(../../config.h)
-
 +d__attribute__()=
 
 // Fix strchr() semtics, it can only return NULL if arg2 != 0

Modified: trunk/varnish-cache/bin/varnishncsa/flint.sh
===================================================================
--- trunk/varnish-cache/bin/varnishncsa/flint.sh	2010-06-05 12:51:33 UTC (rev 4900)
+++ trunk/varnish-cache/bin/varnishncsa/flint.sh	2010-06-05 13:03:56 UTC (rev 4901)
@@ -5,6 +5,7 @@
 	-I/usr/include \
 	-I. \
 	-I../../include \
+	../flint.lnt \
 	flint.lnt \
 	*.c > $T 2>&1
 

Modified: trunk/varnish-cache/bin/varnishtest/flint.lnt
===================================================================
--- trunk/varnish-cache/bin/varnishtest/flint.lnt	2010-06-05 12:51:33 UTC (rev 4900)
+++ trunk/varnish-cache/bin/varnishtest/flint.lnt	2010-06-05 13:03:56 UTC (rev 4901)
@@ -1,7 +1,5 @@
--passes=3
 
 +libh mgt_event.h
-+libh ../../config.h
 
 -emacro((???),va_arg)   // the va_arg() macro can yield 415, 416, 661, 662
                         // 796 and 797 (out-of-bounds errors).
@@ -20,11 +18,6 @@
 
 
 
-
-
-
-// -header(../../config.h)
-
 // Fix strchr() semtics, it can only return NULL if arg2 != 0
 -sem(strchr, 1p, type(1), 2n == 0 ? (@p < 1p) : (@p < 1p || @p == 0 ))
 // 

Modified: trunk/varnish-cache/bin/varnishtest/flint.sh
===================================================================
--- trunk/varnish-cache/bin/varnishtest/flint.sh	2010-06-05 12:51:33 UTC (rev 4900)
+++ trunk/varnish-cache/bin/varnishtest/flint.sh	2010-06-05 13:03:56 UTC (rev 4901)
@@ -5,5 +5,6 @@
 	-I. \
 	-I../../include \
 	-I../.. \
+	../flint.lnt \
 	flint.lnt \
 	*.c