r3003 - trunk/varnish-cache/lib/libvcl

phk at projects.linpro.no phk at projects.linpro.no
Wed Jul 23 19:09:53 CEST 2008


Author: phk
Date: 2008-07-23 19:09:53 +0200 (Wed, 23 Jul 2008)
New Revision: 3003

Modified:
   trunk/varnish-cache/lib/libvcl/vcc_compile.c
Log:
Flexelint nits



Modified: trunk/varnish-cache/lib/libvcl/vcc_compile.c
===================================================================
--- trunk/varnish-cache/lib/libvcl/vcc_compile.c	2008-07-23 17:04:53 UTC (rev 3002)
+++ trunk/varnish-cache/lib/libvcl/vcc_compile.c	2008-07-23 17:09:53 UTC (rev 3003)
@@ -415,7 +415,7 @@
 	assert(f != NULL);
 	i = read(fd, f, st.st_size);
 	assert(i == st.st_size);
-	close(fd);
+	AZ(close(fd));
 	f[i] = '\0';
 	sp = vcc_new_source(f, f + i, fn);
 	sp->freeit = f;
@@ -610,13 +610,11 @@
 		return (vcc_DestroyTokenList(tl, NULL));
 
 	/* Check that all action returns are legal */
-	vcc_CheckAction(tl);
-	if (tl->err)
+	if (vcc_CheckAction(tl) || tl->err)
 		return (vcc_DestroyTokenList(tl, NULL));
 
 	/* Check that all variable uses are legal */
-	vcc_CheckUses(tl);
-	if (tl->err)
+	if (vcc_CheckUses(tl) || tl->err)
 		return (vcc_DestroyTokenList(tl, NULL));
 
 	/* Emit method functions */




More information about the varnish-commit mailing list