From d3efb15e6e8ca185ab701a2af03966f2c0fcb094 Mon Sep 17 00:00:00 2001 From: phk Date: Mon, 6 Aug 2007 09:28:44 +0000 Subject: [PATCH] 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 --- varnish-cache/bin/varnishd/cache.h | 1 - varnish-cache/bin/varnishd/cache_center.c | 1 + varnish-cache/bin/varnishd/cache_ws.c | 3 +++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/varnish-cache/bin/varnishd/cache.h b/varnish-cache/bin/varnishd/cache.h index 7c7eeb17..b28c0c75 100644 --- 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 2f0a7b8d..91cc1b09 100644 --- 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 ddaf1d1c..de36078a 100644 --- 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 -- 2.39.5