[6.0] b85ded2f7 Constify
Dridi Boukelmoune
dridi.boukelmoune at gmail.com
Thu Aug 16 08:52:45 UTC 2018
commit b85ded2f7c6bff43bbaeb4457630f268fcbb26dc
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date: Tue Apr 17 22:28:32 2018 +0000
Constify
Conflicts:
bin/varnishd/cache/cache.h
Arguably, this is a breaking change in $ABI vrt.
diff --git a/bin/varnishd/cache/cache.h b/bin/varnishd/cache/cache.h
index 582f70bf4..f349d4f54 100644
--- a/bin/varnishd/cache/cache.h
+++ b/bin/varnishd/cache/cache.h
@@ -750,7 +750,7 @@ unsigned WS_Reserve(struct ws *ws, unsigned bytes);
unsigned WS_ReserveLumps(struct ws *ws, size_t sz);
void WS_MarkOverflow(struct ws *ws);
void WS_Release(struct ws *ws, unsigned bytes);
-void WS_ReleaseP(struct ws *ws, char *ptr);
+void WS_ReleaseP(struct ws *ws, const char *ptr);
void WS_Assert(const struct ws *ws);
void WS_Reset(struct ws *ws, uintptr_t);
void *WS_Alloc(struct ws *ws, unsigned bytes);
diff --git a/bin/varnishd/cache/cache_ws.c b/bin/varnishd/cache/cache_ws.c
index a58f6573a..3ec5ec017 100644
--- a/bin/varnishd/cache/cache_ws.c
+++ b/bin/varnishd/cache/cache_ws.c
@@ -275,7 +275,7 @@ WS_Release(struct ws *ws, unsigned bytes)
}
void
-WS_ReleaseP(struct ws *ws, char *ptr)
+WS_ReleaseP(struct ws *ws, const char *ptr)
{
WS_Assert(ws);
DSL(DBG_WORKSPACE, 0, "WS_ReleaseP(%p, %p (%zd))", ws, ptr, ptr - ws->f);
More information about the varnish-commit
mailing list