[master] bbc6e2c60 Flexelinting
Poul-Henning Kamp
phk at FreeBSD.org
Wed Sep 5 07:29:09 UTC 2018
commit bbc6e2c60b8f13396299f7f5ab2131aa10c76d92
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date: Wed Sep 5 07:26:15 2018 +0000
Flexelinting
diff --git a/bin/varnishd/cache/cache_shmlog.c b/bin/varnishd/cache/cache_shmlog.c
index 9ae48331b..e4db8158f 100644
--- a/bin/varnishd/cache/cache_shmlog.c
+++ b/bin/varnishd/cache/cache_shmlog.c
@@ -260,7 +260,7 @@ VSL_Flush(struct vsl_log *vsl, int overflow)
memcpy(p + 2, vsl->wlb, l);
p[1] = l;
VWMB();
- p[0] = ((((unsigned)SLT__Batch & 0xff) << 24) | 0);
+ p[0] = ((((unsigned)SLT__Batch & 0xff) << 24));
vsl->wlp = vsl->wlb;
vsl->wlr = 0;
}
diff --git a/bin/varnishd/cache/cache_vary.c b/bin/varnishd/cache/cache_vary.c
index 379f7b36f..46d6930fb 100644
--- a/bin/varnishd/cache/cache_vary.c
+++ b/bin/varnishd/cache/cache_vary.c
@@ -335,7 +335,7 @@ VRY_Match(struct req *req, const uint8_t *vary)
memcpy(vsp + 2, vary + 2, vary[2] + 2);
if (h != NULL)
memcpy(vsp + 2 + vsp[2] + 2, h, lh);
- vsp[ln + 0] = 0xff;
+ vsp[ln] = 0xff;
vsp[ln + 1] = 0xff;
vsp[ln + 2] = 0;
(void)VRY_Validate(vsp);
diff --git a/bin/varnishd/cache/cache_vrt_var.c b/bin/varnishd/cache/cache_vrt_var.c
index bfd0d80df..7cb3feb17 100644
--- a/bin/varnishd/cache/cache_vrt_var.c
+++ b/bin/varnishd/cache/cache_vrt_var.c
@@ -629,6 +629,8 @@ VRT_r_##which##_##fld(VRT_CTX) \
return (d); \
}
+/*lint -save -e835 */ // Zero right hand arg to '-'
+
VRT_DO_EXP_R(obj, ctx->req->objcore, ttl,
ttl_now(ctx) - ctx->req->objcore->t_origin)
VRT_DO_EXP_R(obj, ctx->req->objcore, grace, 0)
@@ -643,6 +645,8 @@ VRT_DO_EXP_R(beresp, ctx->bo->fetch_objcore, grace, 0)
VRT_DO_EXP_L(beresp, ctx->bo->fetch_objcore, keep, 0)
VRT_DO_EXP_R(beresp, ctx->bo->fetch_objcore, keep, 0)
+/*lint -restore */
+
/*--------------------------------------------------------------------
*/
More information about the varnish-commit
mailing list