Forgot an assert.

WS_Return() is now unused, comment it out.

git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@1806 d4fa192b-c00b-0410-8231-f00ffab90ce4

diff --git a/varnish-cache/bin/varnishd/cache.h b/varnish-cache/bin/varnishd/cache.h
index 7c7eeb17a9b8dd899dd5e038299a6039acbcf032..b28c0c75a79ff5db338eae80da11cb24fcf68d30 100644 (file)
--- a/varnish-cache/bin/varnishd/cache.h
+++ b/varnish-cache/bin/varnishd/cache.h
@@ -95,7 +95,6 @@ void WS_ReleaseP(struct ws *ws, char *ptr);
 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.

diff --git a/varnish-cache/bin/varnishd/cache_center.c b/varnish-cache/bin/varnishd/cache_center.c
index 2f0a7b8de861ad7a395a15c4fd093c5d5fa34e5f..91cc1b09bc278f0031f872bd750df7813e63bfdc 100644 (file)
--- a/varnish-cache/bin/varnishd/cache_center.c
+++ b/varnish-cache/bin/varnishd/cache_center.c
@@ -482,6 +482,7 @@ cnt_lookup(struct sess *sp)
                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)

diff --git a/varnish-cache/bin/varnishd/cache_ws.c b/varnish-cache/bin/varnishd/cache_ws.c
index ddaf1d1c06b3e7484fa0928d3280e3e2ba7ff521..de36078a66ae58c00c34a4f7587c5e35132184fc 100644 (file)
--- a/varnish-cache/bin/varnishd/cache_ws.c
+++ b/varnish-cache/bin/varnishd/cache_ws.c
@@ -129,6 +129,8 @@ WS_ReleaseP(struct ws *ws, char *ptr)
        ws->r = NULL;
 }
 
+#if 0
+/* XXX: not used anywhere (yet) */
 void
 WS_Return(struct ws *ws, char *s, char *e)
 {
@@ -137,3 +139,4 @@ WS_Return(struct ws *ws, char *s, char *e)
        if (e == ws->f)
                ws->f = s;
 }
+#endif