Commit cc21640e authored by Poul-Henning Kamp's avatar Poul-Henning Kamp

Forgot an assert.

WS_Return() is now unused, comment it out.


git-svn-id: http://www.varnish-cache.org/svn/trunk/varnish-cache@1806 d4fa192b-c00b-0410-8231-f00ffab90ce4
parent 93a770e4
...@@ -95,7 +95,6 @@ void WS_ReleaseP(struct ws *ws, char *ptr); ...@@ -95,7 +95,6 @@ void WS_ReleaseP(struct ws *ws, char *ptr);
void WS_Assert(struct ws *ws); void WS_Assert(struct ws *ws);
void WS_Reset(struct ws *ws); void WS_Reset(struct ws *ws);
char *WS_Alloc(struct ws *ws, unsigned bytes); char *WS_Alloc(struct ws *ws, unsigned bytes);
void WS_Return(struct ws *ws, char *b, char *e);
/*-------------------------------------------------------------------- /*--------------------------------------------------------------------
* HTTP Request/Response/Header handling structure. * HTTP Request/Response/Header handling structure.
......
...@@ -482,6 +482,7 @@ cnt_lookup(struct sess *sp) ...@@ -482,6 +482,7 @@ cnt_lookup(struct sess *sp)
sp->nhashptr = sp->vcl->nhashcount * 2; sp->nhashptr = sp->vcl->nhashcount * 2;
p = WS_Alloc(sp->http->ws, p = WS_Alloc(sp->http->ws,
sizeof(const char *) * (sp->nhashptr + 1)); sizeof(const char *) * (sp->nhashptr + 1));
XXXAN(p);
u = (uintptr_t)p; u = (uintptr_t)p;
u &= sizeof(const char *) - 1; u &= sizeof(const char *) - 1;
if (u) if (u)
......
...@@ -129,6 +129,8 @@ WS_ReleaseP(struct ws *ws, char *ptr) ...@@ -129,6 +129,8 @@ WS_ReleaseP(struct ws *ws, char *ptr)
ws->r = NULL; ws->r = NULL;
} }
#if 0
/* XXX: not used anywhere (yet) */
void void
WS_Return(struct ws *ws, char *s, char *e) WS_Return(struct ws *ws, char *s, char *e)
{ {
...@@ -137,3 +139,4 @@ 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) if (e == ws->f)
ws->f = s; ws->f = s;
} }
#endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment