r3678 - in branches/2.0/varnish-cache: bin/varnishd lib/libvcl

[tfheen at projects.linpro.no]

Author: tfheen
Date: 2009-02-06 15:27:47 +0100 (Fri, 06 Feb 2009)
New Revision: 3678

Modified:
   branches/2.0/varnish-cache/bin/varnishd/flint.lnt
   branches/2.0/varnish-cache/lib/libvcl/vcc_compile.c
Log:
Merge r3487: More flexelinting.



Modified: branches/2.0/varnish-cache/bin/varnishd/flint.lnt
===================================================================
--- branches/2.0/varnish-cache/bin/varnishd/flint.lnt	2009-02-06 14:23:50 UTC (rev 3677)
+++ branches/2.0/varnish-cache/bin/varnishd/flint.lnt	2009-02-06 14:27:47 UTC (rev 3678)
@@ -40,7 +40,7 @@
 -esym(458, heritage)
 -esym(458, name_key)
 //////////////
--passes=1
+-passes=3
 
 +libh mgt_event.h
 +libh ../../config.h
@@ -54,6 +54,7 @@
 -emacro(527, WRONG)	// unreachable code
 
 -emacro(702, WEXITSTATUS)	// signed shift right 
+-efunc(525, VCC_Return_Name)	// Negative indent
 
 
 // -header(../../config.h)

Modified: branches/2.0/varnish-cache/lib/libvcl/vcc_compile.c
===================================================================
--- branches/2.0/varnish-cache/lib/libvcl/vcc_compile.c	2009-02-06 14:23:50 UTC (rev 3677)
+++ branches/2.0/varnish-cache/lib/libvcl/vcc_compile.c	2009-02-06 14:27:47 UTC (rev 3678)
@@ -668,8 +668,9 @@
 #define VCL_RET_MAC(l, U) case VCL_RET_##U: return(#l);
 #include "vcl_returns.h"
 #undef VCL_RET_MAC
+	default:
+		return (NULL);
 	}
-	return (NULL);
 }
 
 /*--------------------------------------------------------------------