r1806 - trunk/varnish-cache/bin/varnishd

phk at projects.linpro.no phk at projects.linpro.no
Mon Aug 6 11:28:44 CEST 2007


Author: phk
Date: 2007-08-06 11:28:44 +0200 (Mon, 06 Aug 2007)
New Revision: 1806

Modified:
   trunk/varnish-cache/bin/varnishd/cache.h
   trunk/varnish-cache/bin/varnishd/cache_center.c
   trunk/varnish-cache/bin/varnishd/cache_ws.c
Log:
Forgot an assert.

WS_Return() is now unused, comment it out.


Modified: trunk/varnish-cache/bin/varnishd/cache.h
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache.h	2007-08-06 09:25:20 UTC (rev 1805)
+++ trunk/varnish-cache/bin/varnishd/cache.h	2007-08-06 09:28:44 UTC (rev 1806)
@@ -95,7 +95,6 @@
 void WS_Assert(struct ws *ws);
 void WS_Reset(struct ws *ws);
 char *WS_Alloc(struct ws *ws, unsigned bytes);
-void WS_Return(struct ws *ws, char *b, char *e);
 
 /*--------------------------------------------------------------------
  * HTTP Request/Response/Header handling structure.

Modified: trunk/varnish-cache/bin/varnishd/cache_center.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_center.c	2007-08-06 09:25:20 UTC (rev 1805)
+++ trunk/varnish-cache/bin/varnishd/cache_center.c	2007-08-06 09:28:44 UTC (rev 1806)
@@ -482,6 +482,7 @@
 		sp->nhashptr = sp->vcl->nhashcount * 2;
 		p = WS_Alloc(sp->http->ws, 
 		    sizeof(const char *) * (sp->nhashptr + 1));
+		XXXAN(p);
 		u = (uintptr_t)p;
 		u &= sizeof(const char *) - 1;
 		if (u)

Modified: trunk/varnish-cache/bin/varnishd/cache_ws.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_ws.c	2007-08-06 09:25:20 UTC (rev 1805)
+++ trunk/varnish-cache/bin/varnishd/cache_ws.c	2007-08-06 09:28:44 UTC (rev 1806)
@@ -129,6 +129,8 @@
 	ws->r = NULL;
 }
 
+#if 0
+/* XXX: not used anywhere (yet) */
 void
 WS_Return(struct ws *ws, char *s, char *e)
 {
@@ -137,3 +139,4 @@
 	if (e == ws->f)
 		ws->f = s;
 }
+#endif




More information about the varnish-commit mailing list