[master] 6c5148cb0 Minor flexlinting

Poul-Henning Kamp phk at FreeBSD.org
Wed Mar 6 21:02:07 UTC 2019


commit 6c5148cb01844403deefa1edaca466a63e030696
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Wed Mar 6 21:00:50 2019 +0000

    Minor flexlinting

diff --git a/lib/libvmod_directors/vdir.c b/lib/libvmod_directors/vdir.c
index dfb8868d9..a862580b9 100644
--- a/lib/libvmod_directors/vdir.c
+++ b/lib/libvmod_directors/vdir.c
@@ -304,8 +304,9 @@ vdir_update_health(VRT_CTX, struct vdir *vd)
 	VCL_BACKEND be;
 	unsigned u, nh = 0;
 	double tw = 0.0;
-	struct vbitmap *healthy = vd->healthy;
+	struct vbitmap *healthy;
 
+	CHECK_OBJ_NOTNULL(vd, VDIR_MAGIC);
 	healthy = vd->healthy;
 	for (u = 0; u < vd->n_backend; u++) {
 		be = vd->backend[u];
diff --git a/lib/libvmod_directors/vmod_shard.c b/lib/libvmod_directors/vmod_shard.c
index 7efd10cef..d7dd7d7d6 100644
--- a/lib/libvmod_directors/vmod_shard.c
+++ b/lib/libvmod_directors/vmod_shard.c
@@ -757,7 +757,7 @@ vmod_shard_resolve(VRT_CTX, VCL_BACKEND dir)
 				 pp->rampup, pp->healthy));
 }
 
-void v_matchproto_(vdi_list_f)
+static void v_matchproto_(vdi_list_f)
 vmod_shard_list(VRT_CTX, VCL_BACKEND dir, struct vsb *vsb, int pflag, int jflag)
 {
 	struct sharddir *shardd;


More information about the varnish-commit mailing list