r3732 - branches/2.0/varnish-cache/bin/varnishd

tfheen at projects.linpro.no tfheen at projects.linpro.no
Wed Feb 11 08:13:12 CET 2009 

Author: tfheen
Date: 2009-02-11 08:13:12 +0100 (Wed, 11 Feb 2009)
New Revision: 3732

Modified:
   branches/2.0/varnish-cache/bin/varnishd/cache_expire.c
   branches/2.0/varnish-cache/bin/varnishd/cache_fetch.c
   branches/2.0/varnish-cache/bin/varnishd/cache_hash.c
   branches/2.0/varnish-cache/bin/varnishd/cache_http.c
   branches/2.0/varnish-cache/bin/varnishd/flint.lnt
   branches/2.0/varnish-cache/bin/varnishd/mgt.h
   branches/2.0/varnish-cache/bin/varnishd/mgt_cli.c
   branches/2.0/varnish-cache/bin/varnishd/mgt_vcc.c
   branches/2.0/varnish-cache/bin/varnishd/rfc2616.c
Log:
Merge r3550: More FlexeLint silencing.



Modified: branches/2.0/varnish-cache/bin/varnishd/cache_expire.c
===================================================================
--- branches/2.0/varnish-cache/bin/varnishd/cache_expire.c	2009-02-11 07:06:03 UTC (rev 3731)
+++ branches/2.0/varnish-cache/bin/varnishd/cache_expire.c	2009-02-11 07:13:12 UTC (rev 3732)
@@ -184,7 +184,7 @@
 
 	assert(o->entered != 0 && !isnan(o->entered));
 	oe->lru_stamp = o->entered;
-	update_object_when(o);
+	(void)update_object_when(o);
 	Lck_Lock(&exp_mtx);
 	binheap_insert(exp_heap, oe);
 	assert(oe->timer_idx != BINHEAP_NOIDX);
@@ -332,7 +332,7 @@
 				WSL(&ww, SLT_Debug, 0, "Attempt Prefetch %u",
 				    o->xid);
 			}
-			update_object_when(o);
+			(void)update_object_when(o);
 			Lck_Lock(&exp_mtx);
 			binheap_insert(exp_heap, oe);
 			assert(oe->timer_idx != BINHEAP_NOIDX);

Modified: branches/2.0/varnish-cache/bin/varnishd/cache_fetch.c
===================================================================
--- branches/2.0/varnish-cache/bin/varnishd/cache_fetch.c	2009-02-11 07:06:03 UTC (rev 3731)
+++ branches/2.0/varnish-cache/bin/varnishd/cache_fetch.c	2009-02-11 07:13:12 UTC (rev 3732)
@@ -351,7 +351,7 @@
 
 	TCP_blocking(vc->fd);	/* XXX: we should timeout instead */
 	WRW_Reserve(w, &vc->fd);
-	http_Write(w, hp, 0);	/* XXX: stats ? */
+	(void)http_Write(w, hp, 0);	/* XXX: stats ? */
 
 	/* Deal with any message-body the request might have */
 	i = FetchReqBody(sp);

Modified: branches/2.0/varnish-cache/bin/varnishd/cache_hash.c
===================================================================
--- branches/2.0/varnish-cache/bin/varnishd/cache_hash.c	2009-02-11 07:06:03 UTC (rev 3731)
+++ branches/2.0/varnish-cache/bin/varnishd/cache_hash.c	2009-02-11 07:13:12 UTC (rev 3732)
@@ -228,7 +228,6 @@
 HSH_Lookup(struct sess *sp)
 {
 	struct worker *w;
-	struct http *h;
 	struct objhead *oh;
 	struct object *o, *busy_o, *grace_o;
 
@@ -237,7 +236,6 @@
 	CHECK_OBJ_NOTNULL(sp->http, HTTP_MAGIC);
 	AN(hash);
 	w = sp->wrk;
-	h = sp->http;
 
 	HSH_Prealloc(sp);
 	SHA256_Final(sp->wrk->nobjhead->digest, sp->wrk->sha256ctx);

Modified: branches/2.0/varnish-cache/bin/varnishd/cache_http.c
===================================================================
--- branches/2.0/varnish-cache/bin/varnishd/cache_http.c	2009-02-11 07:06:03 UTC (rev 3731)
+++ branches/2.0/varnish-cache/bin/varnishd/cache_http.c	2009-02-11 07:13:12 UTC (rev 3732)
@@ -796,8 +796,8 @@
 		if (http_IsHdr(&hp->hd[u], hdr))
 			continue;
 		if (v != u) {
-			memcpy(&hp->hd[v], &hp->hd[u], sizeof hp->hd[v]);
-			memcpy(&hp->hdf[v], &hp->hdf[u], sizeof hp->hdf[v]);
+			memcpy(&hp->hd[v], &hp->hd[u], sizeof *hp->hd);
+			memcpy(&hp->hdf[v], &hp->hdf[u], sizeof *hp->hdf);
 		}
 		v++;
 	}

Modified: branches/2.0/varnish-cache/bin/varnishd/flint.lnt
===================================================================
--- branches/2.0/varnish-cache/bin/varnishd/flint.lnt	2009-02-11 07:06:03 UTC (rev 3731)
+++ branches/2.0/varnish-cache/bin/varnishd/flint.lnt	2009-02-11 07:13:12 UTC (rev 3732)
@@ -7,6 +7,7 @@
 -e459	// unlocked access from func-ptr
 -e454	// mutex not released (...ReleaseLocked)
 -e457	// unprotected access
+-e777	// float equality comparison
 
 -esym(458, lbv_assert)	// unlocked access
 -esym(458, params)	// unlocked access
@@ -56,6 +57,8 @@
 -emacro(702, WEXITSTATUS)	// signed shift right 
 -efunc(525, VCC_Return_Name)	// Negative indent
 
+
+
 // -header(../../config.h)
 
 // Fix strchr() semtics, it can only return NULL if arg2 != 0

Modified: branches/2.0/varnish-cache/bin/varnishd/mgt.h
===================================================================
--- branches/2.0/varnish-cache/bin/varnishd/mgt.h	2009-02-11 07:06:03 UTC (rev 3731)
+++ branches/2.0/varnish-cache/bin/varnishd/mgt.h	2009-02-11 07:13:12 UTC (rev 3732)
@@ -49,7 +49,7 @@
 int mgt_cli_askchild(unsigned *status, char **resp, const char *fmt, ...);
 void mgt_cli_start_child(int fdi, int fdo);
 void mgt_cli_stop_child(void);
-int mgt_cli_telnet(int dflag, const char *T_arg);
+void mgt_cli_telnet(int dflag, const char *T_arg);
 
 /* mgt_param.c */
 void MCF_ParamSync(void);

Modified: branches/2.0/varnish-cache/bin/varnishd/mgt_cli.c
===================================================================
--- branches/2.0/varnish-cache/bin/varnishd/mgt_cli.c	2009-02-11 07:06:03 UTC (rev 3731)
+++ branches/2.0/varnish-cache/bin/varnishd/mgt_cli.c	2009-02-11 07:13:12 UTC (rev 3732)
@@ -454,7 +454,7 @@
 	return (0);
 }
 
-int
+void
 mgt_cli_telnet(int dflag, const char *T_arg)
 {
 	struct vss_addr **ta;
@@ -494,5 +494,4 @@
 	}
 	free(addr);
 	free(port);
-	return (0);
 }

Modified: branches/2.0/varnish-cache/bin/varnishd/mgt_vcc.c
===================================================================
--- branches/2.0/varnish-cache/bin/varnishd/mgt_vcc.c	2009-02-11 07:06:03 UTC (rev 3731)
+++ branches/2.0/varnish-cache/bin/varnishd/mgt_vcc.c	2009-02-11 07:13:12 UTC (rev 3732)
@@ -263,7 +263,7 @@
 static char *
 mgt_VccCompile(struct vsb **sb, const char *b, int C_flag)
 {
-	char *vf = NULL;
+	char *vf;
 
 	*sb = vsb_newauto();
 	XXXAN(*sb);

Modified: branches/2.0/varnish-cache/bin/varnishd/rfc2616.c
===================================================================
--- branches/2.0/varnish-cache/bin/varnishd/rfc2616.c	2009-02-11 07:06:03 UTC (rev 3731)
+++ branches/2.0/varnish-cache/bin/varnishd/rfc2616.c	2009-02-11 07:13:12 UTC (rev 3732)
@@ -145,7 +145,7 @@
 		 * derive a relative time from the two headers.
 		 * (the negative ttl case is caught above)
 		 */
-		ttl = (h_expires - h_date);
+		ttl = (int)(h_expires - h_date);
 
 	} while (0);

More information about the varnish-commit mailing list