[master] 6e29a15 Constify req.body pointer when interating over it.
Poul-Henning Kamp
phk at FreeBSD.org
Thu Dec 10 01:23:28 CET 2015
commit 6e29a151a0e37b9b6aed5d08f3c8b56008235471
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date: Wed Dec 9 22:00:58 2015 +0000
Constify req.body pointer when interating over it.
diff --git a/bin/varnishd/cache/cache.h b/bin/varnishd/cache/cache.h
index e7700d0..4fac13c 100644
--- a/bin/varnishd/cache/cache.h
+++ b/bin/varnishd/cache/cache.h
@@ -682,7 +682,8 @@ void VBO_waitstate(struct busyobj *bo, enum busyobj_state_e want);
/* cache_req_body.c */
int VRB_Ignore(struct req *req);
ssize_t VRB_Cache(struct req *req, ssize_t maxsize);
-typedef int (req_body_iter_f)(struct req *, void *priv, void *ptr, size_t);
+typedef int (req_body_iter_f)(struct req *, void *priv,
+ const void *ptr, size_t);
ssize_t VRB_Iterate(struct req *req, req_body_iter_f *func, void *priv);
void VRB_Free(struct req *req);
diff --git a/bin/varnishd/cache/cache_req_body.c b/bin/varnishd/cache/cache_req_body.c
index f50621e..02050f9 100644
--- a/bin/varnishd/cache/cache_req_body.c
+++ b/bin/varnishd/cache/cache_req_body.c
@@ -147,7 +147,7 @@ VRB_Iterate(struct req *req, req_body_iter_f *func, void *priv)
*/
static int __match_proto__(req_body_iter_f)
-httpq_req_body_discard(struct req *req, void *priv, void *ptr, size_t len)
+httpq_req_body_discard(struct req *req, void *priv, const void *ptr, size_t len)
{
CHECK_OBJ_NOTNULL(req, REQ_MAGIC);
diff --git a/bin/varnishd/http1/cache_http1_fetch.c b/bin/varnishd/http1/cache_http1_fetch.c
index a69fb92..0a7f100 100644
--- a/bin/varnishd/http1/cache_http1_fetch.c
+++ b/bin/varnishd/http1/cache_http1_fetch.c
@@ -49,7 +49,7 @@
*/
static int __match_proto__(req_body_iter_f)
-vbf_iter_req_body(struct req *req, void *priv, void *ptr, size_t l)
+vbf_iter_req_body(struct req *req, void *priv, const void *ptr, size_t l)
{
struct busyobj *bo;
More information about the varnish-commit
mailing list