r4067 - trunk/varnish-cache/bin/varnishd

[phk at projects.linpro.no]

Author: phk
Date: 2009-05-11 10:05:48 +0200 (Mon, 11 May 2009)
New Revision: 4067

Modified:
   trunk/varnish-cache/bin/varnishd/cache_center.c
   trunk/varnish-cache/bin/varnishd/cache_esi.c
   trunk/varnish-cache/bin/varnishd/cache_lck.c
   trunk/varnish-cache/bin/varnishd/cache_response.c
   trunk/varnish-cache/bin/varnishd/cache_vrt.c
   trunk/varnish-cache/bin/varnishd/varnishd.c
Log:
Quiet flexelint down a bit.



Modified: trunk/varnish-cache/bin/varnishd/cache_center.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_center.c	2009-05-10 21:21:36 UTC (rev 4066)
+++ trunk/varnish-cache/bin/varnishd/cache_center.c	2009-05-11 08:05:48 UTC (rev 4067)
@@ -664,7 +664,7 @@
 
 	if (sp->handling == VCL_RET_DELIVER) {
 		/* Dispose of any body part of the request */
-		FetchReqBody(sp);
+		(void)FetchReqBody(sp);
 		sp->wrk->bereq = NULL;
 		sp->step = STP_DELIVER;
 		return (0);
@@ -1004,7 +1004,7 @@
 		if (sp->esis > 0) {
 			/* XXX: VSL something */
 			INCOMPL();
-			sp->step = STP_DONE;
+			/* sp->step = STP_DONE; */
 			return (1);
 		}
 		sp->step = STP_PIPE;

Modified: trunk/varnish-cache/bin/varnishd/cache_esi.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_esi.c	2009-05-10 21:21:36 UTC (rev 4066)
+++ trunk/varnish-cache/bin/varnishd/cache_esi.c	2009-05-11 08:05:48 UTC (rev 4067)
@@ -381,6 +381,7 @@
 		if ( val.b != val.e ) {
 			s = Tlen(val) + 1;
 			c = WS_Alloc(ws, s);
+			XXXAN(c);
 			memcpy(c, val.b, Tlen(val));
 			val.b = c;
 			val.e = val.b + s;

Modified: trunk/varnish-cache/bin/varnishd/cache_lck.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_lck.c	2009-05-10 21:21:36 UTC (rev 4066)
+++ trunk/varnish-cache/bin/varnishd/cache_lck.c	2009-05-11 08:05:48 UTC (rev 4067)
@@ -48,6 +48,9 @@
 #include "shmlog.h"
 #include "cache.h"
 
+/*The constability of lck depends on platform pthreads implementation */
+/*lint -save -esym(818,lck) */
+
 struct ilck {
 	unsigned		magic;
 #define ILCK_MAGIC		0x7b86c8a5
@@ -190,3 +193,5 @@
 
 	AZ(pthread_mutex_init(&lck_mtx, NULL));
 }
+
+/*lint -restore */

Modified: trunk/varnish-cache/bin/varnishd/cache_response.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_response.c	2009-05-10 21:21:36 UTC (rev 4066)
+++ trunk/varnish-cache/bin/varnishd/cache_response.c	2009-05-11 08:05:48 UTC (rev 4067)
@@ -142,7 +142,7 @@
 
 	WRW_Reserve(sp->wrk, &sp->fd);
 
-	if (!sp->disable_esi == 0 || sp->esis == 0)
+	if (sp->disable_esi || !sp->esis)
 		sp->acct_req.hdrbytes += http_Write(sp->wrk, sp->wrk->resp, 1);
 
 	if (!sp->disable_esi && sp->wantbody && !VTAILQ_EMPTY(&sp->obj->esibits)) {

Modified: trunk/varnish-cache/bin/varnishd/cache_vrt.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_vrt.c	2009-05-10 21:21:36 UTC (rev 4066)
+++ trunk/varnish-cache/bin/varnishd/cache_vrt.c	2009-05-11 08:05:48 UTC (rev 4067)
@@ -53,8 +53,11 @@
 #include "hash_slinger.h"
 #include "cache_backend.h"
 
+/*XXX: sort of a hack, improve the Tcl code in the compiler to avoid */
+/*lint -save -esym(818,sp) */
+
 void *vrt_magic_string_end = &vrt_magic_string_end;
-char vrt_hostname[255] = "";
+static char vrt_hostname[255] = "";
 
 /*--------------------------------------------------------------------*/
 
@@ -658,9 +661,9 @@
 	(void)sp;
 
 	if (vrt_hostname[0] == '\0')
-		gethostname(vrt_hostname, 255);
+		AZ(gethostname(vrt_hostname, 255));
 	
-	return (const char*) &vrt_hostname;
+	return (vrt_hostname);
 }
 
 int
@@ -983,3 +986,4 @@
 	(void)memmove(dst, src, len);
 }
 
+/*lint -restore */

Modified: trunk/varnish-cache/bin/varnishd/varnishd.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/varnishd.c	2009-05-10 21:21:36 UTC (rev 4066)
+++ trunk/varnish-cache/bin/varnishd/varnishd.c	2009-05-11 08:05:48 UTC (rev 4067)
@@ -472,7 +472,7 @@
 			strcpy(s->n, p);
 			VTAILQ_INSERT_TAIL(&symbols, s, list);
 		}
-		pclose(fi);
+		(void)pclose(fi);
 	}
 }