[master] 6545ac1 White-space fix and minor flexelint-comforting

Poul-Henning Kamp phk at FreeBSD.org
Fri Jan 8 15:52:14 CET 2016


commit 6545ac19effe8caffbb07a35e1a4a07e81464421
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Fri Jan 8 14:51:56 2016 +0000

    White-space fix and minor flexelint-comforting

diff --git a/lib/libvmod_directors/random.c b/lib/libvmod_directors/random.c
index d283f04..dee16ff 100644
--- a/lib/libvmod_directors/random.c
+++ b/lib/libvmod_directors/random.c
@@ -114,7 +114,7 @@ vmod_random_add_backend(VRT_CTX,
 }
 
 VCL_VOID vmod_random_remove_backend(VRT_CTX,
-    struct vmod_directors_random *rr, VCL_BACKEND be)
+    struct vmod_directors_random *rr, VCL_BACKEND be) __match_proto__()
 {
 	CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
 	CHECK_OBJ_NOTNULL(rr, VMOD_DIRECTORS_RANDOM_MAGIC);
diff --git a/lib/libvmod_directors/vdir.c b/lib/libvmod_directors/vdir.c
index ddbfbcc..22dfee3 100644
--- a/lib/libvmod_directors/vdir.c
+++ b/lib/libvmod_directors/vdir.c
@@ -140,27 +140,27 @@ vdir_add_backend(struct vdir *vd, VCL_BACKEND be, double weight)
 unsigned
 vdir_remove_backend(struct vdir *vd, VCL_BACKEND be)
 {
-        unsigned u, n;
-
-        CHECK_OBJ_NOTNULL(vd, VDIR_MAGIC);
-        if (be == NULL)
-                return vd->n_backend;
-        CHECK_OBJ(be, DIRECTOR_MAGIC);
-        vdir_wrlock(vd);
-        for (u = 0; u < vd->n_backend; u++)
-                if (vd->backend[u] == be)
-                        break;
-        if (u == vd->n_backend) {
-                vdir_unlock(vd);
-                return vd->n_backend;
-        }
-        vd->total_weight -= vd->weight[u];
-        n = vd->n_backend - u - 1;
-        memmove(&vd->backend[u], &vd->backend[u+1], n * sizeof(vd->backend[0]));
-        memmove(&vd->weight[u], &vd->weight[u+1], n * sizeof(vd->weight[0]));
-        vd->n_backend--;
-        vdir_unlock(vd);
-        return vd->n_backend;
+	unsigned u, n;
+
+	CHECK_OBJ_NOTNULL(vd, VDIR_MAGIC);
+	if (be == NULL)
+		return (vd->n_backend);
+	CHECK_OBJ(be, DIRECTOR_MAGIC);
+	vdir_wrlock(vd);
+	for (u = 0; u < vd->n_backend; u++)
+		if (vd->backend[u] == be)
+			break;
+	if (u == vd->n_backend) {
+		vdir_unlock(vd);
+		return (vd->n_backend);
+	}
+	vd->total_weight -= vd->weight[u];
+	n = (vd->n_backend - u) - 1;
+	memmove(&vd->backend[u], &vd->backend[u+1], n * sizeof(vd->backend[0]));
+	memmove(&vd->weight[u], &vd->weight[u+1], n * sizeof(vd->weight[0]));
+	vd->n_backend--;
+	vdir_unlock(vd);
+	return (vd->n_backend);
 }
 
 unsigned



More information about the varnish-commit mailing list