[5.2] 6ca3781 Minor flexelintery
PÃ¥l Hermunn Johansen
hermunn at varnish-software.com
Thu Sep 7 06:59:07 UTC 2017
commit 6ca378105ee37c41b6db2d0e0fca31e43daf4907
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date: Tue Sep 5 20:43:50 2017 +0000
Minor flexelintery
diff --git a/bin/varnishd/cache/cache_fetch.c b/bin/varnishd/cache/cache_fetch.c
index b8066a1..fe3fdae 100644
--- a/bin/varnishd/cache/cache_fetch.c
+++ b/bin/varnishd/cache/cache_fetch.c
@@ -1084,7 +1084,7 @@ VBF_Fetch(struct worker *wrk, struct req *req, struct objcore *oc,
bo = NULL; /* ref transferred to fetch thread */
if (mode == VBF_BACKGROUND) {
ObjWaitState(oc, BOS_REQ_DONE);
- VRB_Ignore(req);
+ (void)VRB_Ignore(req);
} else {
ObjWaitState(oc, BOS_STREAM);
if (oc->boc->state == BOS_FAILED) {
diff --git a/bin/varnishd/cache/cache_req_fsm.c b/bin/varnishd/cache/cache_req_fsm.c
index 5837bd6..0b56b80 100644
--- a/bin/varnishd/cache/cache_req_fsm.c
+++ b/bin/varnishd/cache/cache_req_fsm.c
@@ -922,7 +922,7 @@ cnt_purge(struct worker *wrk, struct req *req)
CHECK_OBJ_NOTNULL(boc, OBJCORE_MAGIC);
VRY_Finish(req, DISCARD);
- HSH_Purge(wrk, boc->objhead, 0, 0, 0);
+ (void)HSH_Purge(wrk, boc->objhead, 0, 0, 0);
AZ(HSH_DerefObjCore(wrk, &boc, 1));
diff --git a/bin/varnishd/cache/cache_vrt_var.c b/bin/varnishd/cache/cache_vrt_var.c
index 8c22e1a..1cdb983 100644
--- a/bin/varnishd/cache/cache_vrt_var.c
+++ b/bin/varnishd/cache/cache_vrt_var.c
@@ -38,7 +38,6 @@
#include "cache_director.h"
#include "vrt.h"
#include "vrt_obj.h"
-#include "vsha256.h"
static char vrt_hostname[255] = "";
@@ -769,7 +768,7 @@ VRT_BODY_L(resp)
/*--------------------------------------------------------------------*/
static struct vmod_priv *
-vrt_do_blob(VRT_CTX, const char *err, uint8_t *src, size_t len)
+vrt_do_blob(VRT_CTX, const char *err, const uint8_t *src, size_t len)
{
struct vmod_priv *p;
void *d;
More information about the varnish-commit
mailing list