[master] bb5eed177 White space OCD

[Poul-Henning Kamp]

commit bb5eed1771926f0ebd5acdb533e367827db4f2e4
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Tue Nov 23 09:55:15 2021 +0000

    White space OCD

diff --git a/bin/varnishd/cache/cache_esi_deliver.c b/bin/varnishd/cache/cache_esi_deliver.c
index 07af11e37..c3c78fb91 100644
--- a/bin/varnishd/cache/cache_esi_deliver.c
+++ b/bin/varnishd/cache/cache_esi_deliver.c
@@ -800,10 +800,10 @@ ved_gzgz_fini(struct vdp_ctx *vdc, void **priv)
 }
 
 static const struct vdp ved_gzgz = {
-	.name =         "VZZ",
-	.init =         ved_gzgz_init,
-	.bytes =        ved_gzgz_bytes,
-	.fini =         ved_gzgz_fini,
+	.name =		"VZZ",
+	.init =		ved_gzgz_init,
+	.bytes =	ved_gzgz_bytes,
+	.fini =		ved_gzgz_fini,
 };
 
 /*--------------------------------------------------------------------
diff --git a/bin/varnishd/cache/cache_wrk.c b/bin/varnishd/cache/cache_wrk.c
index b44aa23bc..54170600d 100644
--- a/bin/varnishd/cache/cache_wrk.c
+++ b/bin/varnishd/cache/cache_wrk.c
@@ -437,9 +437,9 @@ Pool_Work_Thread(struct pool *pp, struct worker *wrk)
 				else if (wrk->wpriv->vcl == NULL)
 					tmo = 0;
 				else if (DO_DEBUG(DBG_VTC_MODE))
-					tmo =  now + 1.;
+					tmo = now + 1.;
 				else
-					tmo =  now + 60.;
+					tmo = now + 60.;
 				(void)Lck_CondWaitUntil(
 				    &wrk->cond, &pp->mtx, tmo);
 				if (wrk->task->func != NULL) {
diff --git a/bin/varnishd/http2/cache_http2_proto.c b/bin/varnishd/http2/cache_http2_proto.c
index 572275392..df5d4bc2e 100644
--- a/bin/varnishd/http2/cache_http2_proto.c
+++ b/bin/varnishd/http2/cache_http2_proto.c
@@ -1393,8 +1393,8 @@ h2_rxframe(struct worker *wrk, struct h2_sess *h2)
 	if (h2->do_sweep)
 		(void)h2_sweep(wrk, h2);
 
-	h2->rxf_len =  vbe32dec(h2->htc->rxbuf_b) >> 8;
-	h2->rxf_type =  h2->htc->rxbuf_b[3];
+	h2->rxf_len = vbe32dec(h2->htc->rxbuf_b) >> 8;
+	h2->rxf_type = h2->htc->rxbuf_b[3];
 	h2->rxf_flags = h2->htc->rxbuf_b[4];
 	h2->rxf_stream = vbe32dec(h2->htc->rxbuf_b + 5);
 	h2->rxf_stream &= ~(1LU<<31);			// rfc7540,l,690,692
diff --git a/bin/varnishtest/vtc_h2_hpack.c b/bin/varnishtest/vtc_h2_hpack.c
index 085741323..d4580196a 100644
--- a/bin/varnishtest/vtc_h2_hpack.c
+++ b/bin/varnishtest/vtc_h2_hpack.c
@@ -206,7 +206,7 @@ num_encode(struct hpk_iter *iter, uint8_t prefix, uint32_t num)
 	uint8_t pmax = (1U << prefix) - 1U;
 
 	*iter->buf &= 0xffU << prefix;
-	if (num <=  pmax) {
+	if (num <= pmax) {
 		*iter->buf++ |= num;
 		return (ITER_DONE(iter));
 	} else if (iter->end - iter->buf < 2)
diff --git a/bin/varnishtest/vtc_main.c b/bin/varnishtest/vtc_main.c
index 2194d6621..9dccb70bb 100644
--- a/bin/varnishtest/vtc_main.c
+++ b/bin/varnishtest/vtc_main.c
@@ -527,7 +527,7 @@ i_mode(void)
 			    "could not find 'abs_top_builddir' in Makefile\n");
 			exit(2);
 		}
-		topbuild =  strchr(p + 1, '\n');
+		topbuild = strchr(p + 1, '\n');
 		if (topbuild == NULL) {
 			fprintf(stderr,
 			    "No NL after 'abs_top_builddir' in Makefile\n");
diff --git a/include/vapi/vsl.h b/include/vapi/vsl.h
index 7d75ef772..4df8e14dc 100644
--- a/include/vapi/vsl.h
+++ b/include/vapi/vsl.h
@@ -327,7 +327,7 @@ enum vsl_check {
 	vsl_check_e_notsupp	= -1,
 	vsl_check_e_inval	=  0,
 	vsl_check_warn		=  1,
-	vsl_check_valid	=  2
+	vsl_check_valid		=  2
 };
 
 enum vsl_check
diff --git a/vmod/vmod_debug.c b/vmod/vmod_debug.c
index 266d194f0..aee0a9350 100644
--- a/vmod/vmod_debug.c
+++ b/vmod/vmod_debug.c
@@ -1055,15 +1055,15 @@ xyzzy_get_ip(VRT_CTX)
 
 extern const struct vmod_data Vmod_wrong0_Data;
 const struct vmod_data Vmod_wrong0_Data = {
-	.vrt_major =    0,
-	.vrt_minor =    0,
+	.vrt_major =	0,
+	.vrt_minor =	0,
 };
 
 //lint -save -e835 A zero has been given as left argument to operatorp'+'
 extern const struct vmod_data Vmod_wrong1_Data;
 const struct vmod_data Vmod_wrong1_Data = {
-	.vrt_major =    VRT_MAJOR_VERSION,
-	.vrt_minor =    VRT_MINOR_VERSION + 1,
+	.vrt_major =	VRT_MAJOR_VERSION,
+	.vrt_minor =	VRT_MINOR_VERSION + 1,
 };
 //lint -restore
 
@@ -1073,8 +1073,8 @@ static const struct foo {
 
 extern const struct vmod_data Vmod_wrong2_Data;
 const struct vmod_data Vmod_wrong2_Data = {
-	.vrt_major =    VRT_MAJOR_VERSION,
-	.vrt_minor =    VRT_MINOR_VERSION,
+	.vrt_major =	VRT_MAJOR_VERSION,
+	.vrt_minor =	VRT_MINOR_VERSION,
 	.name =		"wrongN",
 	.func =		foo_struct,
 	.func_len =	sizeof foo_struct,
@@ -1084,8 +1084,8 @@ const struct vmod_data Vmod_wrong2_Data = {
 
 extern const struct vmod_data Vmod_wrong3_Data;
 const struct vmod_data Vmod_wrong3_Data = {
-	.vrt_major =    VRT_MAJOR_VERSION,
-	.vrt_minor =    VRT_MINOR_VERSION,
+	.vrt_major =	VRT_MAJOR_VERSION,
+	.vrt_minor =	VRT_MINOR_VERSION,
 	.name =		"wrongN",
 	.func =		foo_struct,
 	.func_len =	sizeof foo_struct,