[5.2] f679045 Whitespace OCD

PÃ¥l Hermunn Johansen hermunn at varnish-software.com
Thu Sep 7 08:35:05 UTC 2017


commit f6790459151f8ac7604698ffd6f569b9b0ac211d
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Wed Sep 6 21:01:00 2017 +0000

    Whitespace OCD

diff --git a/bin/varnishtest/tests/m00038.vtc b/bin/varnishtest/tests/m00038.vtc
index f69bd58..894618d 100644
--- a/bin/varnishtest/tests/m00038.vtc
+++ b/bin/varnishtest/tests/m00038.vtc
@@ -45,11 +45,11 @@ varnish v1 -vcl {
 
 	    set resp.http.b64decall =
 	       blob.encode(HEXLC, blob.decode_n(128, BASE64,
-					                req.http.all));
+							req.http.all));
 
 	    set resp.http.urldechobbes =
 	      blob.encode(IDENTITY, blob.decode_n(180, BASE64URL,
-						          req.http.hobbes));
+							  req.http.hobbes));
 
 	    set resp.http.urldecall =
 	      blob.encode(HEXLC,
@@ -76,7 +76,7 @@ varnish v1 -vcl {
 	    set resp.http.emptypieces =
 	      blob.encode(IDENTITY,
 	      blob.decode_n(0, BASE64, req.http.unset + "" + req.http.unset
-				           + "" + req.http.unset + ""));
+					   + "" + req.http.unset + ""));
 
 	    set resp.http.decenc
 	      = blob.encode(BASE64,
diff --git a/bin/varnishtest/tests/m00039.vtc b/bin/varnishtest/tests/m00039.vtc
index 77fb240..8048ccf 100644
--- a/bin/varnishtest/tests/m00039.vtc
+++ b/bin/varnishtest/tests/m00039.vtc
@@ -150,7 +150,7 @@ varnish v1 -vcl {
 	    set resp.http.decemptypieces =
 	      blob.encode(IDENTITY,
 			      blob.decode(URL, req.http.unset + ""
-					           + req.http.unset + ""));
+						   + req.http.unset + ""));
 
 	    set req.http.part1 = "foo%";
 	    set resp.http.dec2pieces =
@@ -235,11 +235,11 @@ varnish v1 -vcl+backend {
 		}
 		elsif (req.url == "/percent-two") {
 			set resp.http.bad = blob.encode(URLUC,
-				            blob.decode(URL, "%2"));
+					    blob.decode(URL, "%2"));
 		}
 		elsif (req.url == "/percent-q") {
 			set resp.http.bad = blob.encode(URLUC,
-				            blob.decode(URL, "%q"));
+					    blob.decode(URL, "%q"));
 		}
 		elsif (req.url == "/percent-two-q") {
 			set resp.http.bad = blob.encode(URLUC,
diff --git a/bin/varnishtest/tests/m00040.vtc b/bin/varnishtest/tests/m00040.vtc
index 0ec8842..b3c87b3 100644
--- a/bin/varnishtest/tests/m00040.vtc
+++ b/bin/varnishtest/tests/m00040.vtc
@@ -82,13 +82,13 @@ varnish v1 -vcl {
 	    set resp.http.decemptypieces =
 	      blob.encode(IDENTITY,
 			      blob.decode_n(1, URL, req.http.unset + ""
-					                + req.http.unset + ""));
+							+ req.http.unset + ""));
 
 	    set req.http.part1 = "foo%";
 	    set resp.http.dec2pieces =
 	      blob.encode(IDENTITY,
 			      blob.decode_n(6, URL, req.http.part1 +
-				                        "20bar%20baz%20quux"));
+							"20bar%20baz%20quux"));
 
 	    set req.http.part2 = "0quux";
 	    set resp.http.dec3param =
@@ -150,19 +150,19 @@ varnish v1 -vcl+backend {
 	sub vcl_deliver {
 		if (req.url == "/percent") {
 			set resp.http.bad = blob.encode(URLUC,
-				            blob.decode_n(1, URL, "%20"));
+					    blob.decode_n(1, URL, "%20"));
 		}
 		elsif (req.url == "/percent-two") {
 			set resp.http.bad = blob.encode(URLUC,
-				            blob.decode_n(2, URL, "%20"));
+					    blob.decode_n(2, URL, "%20"));
 		}
 		elsif (req.url == "/comma") {
 			set resp.http.good = blob.encode(IDENTITY,
-				            blob.decode_n(3, URL, "%2c%q"));
+					    blob.decode_n(3, URL, "%2c%q"));
 		}
 		elsif (req.url == "/colon") {
 			set resp.http.good = blob.encode(IDENTITY,
-				           blob.decode_n(3, URL, "%3a%2q"));
+					   blob.decode_n(3, URL, "%3a%2q"));
 		}
 	}
 }
diff --git a/bin/varnishtest/tests/m00041.vtc b/bin/varnishtest/tests/m00041.vtc
index 811d814..c350ee1 100644
--- a/bin/varnishtest/tests/m00041.vtc
+++ b/bin/varnishtest/tests/m00041.vtc
@@ -346,12 +346,12 @@ varnish v1 -vcl+backend {
 		elsif (req.url == "/6") {
 			set resp.http.bad
 			    = blob.transcode(BASE64URL, BASE64URL,
-				                 "/+/+" + req.http.foo);
+						 "/+/+" + req.http.foo);
 		}
 		elsif (req.url == "/7") {
 			set resp.http.bad
 			    = blob.transcode(BASE64URLNOPAD, BASE64URLNOPAD,
-				                 "Zm9v" + req.http.foo);
+						 "Zm9v" + req.http.foo);
 		}
 		elsif (req.url == "/8") {
 			set resp.http.bad
diff --git a/bin/varnishtest/tests/m00042.vtc b/bin/varnishtest/tests/m00042.vtc
index 164846a..37ed285 100644
--- a/bin/varnishtest/tests/m00042.vtc
+++ b/bin/varnishtest/tests/m00042.vtc
@@ -333,38 +333,38 @@ varnish v1 -vcl+backend {
 		elsif (req.url == "/3") {
 			set resp.http.bad
 			    = blob.transcode_n(8, HEX, IDENTITY,
-				                   "0x123456");
+						   "0x123456");
 		}
 		elsif (req.url == "/4") {
 			set resp.http.bad
 			    = blob.transcode_n(4, BASE64, IDENTITY,
-				                   "-_-_" + req.http.foo);
+						   "-_-_" + req.http.foo);
 		}
 		elsif (req.url == "/5") {
 			set resp.http.bad
 			    = blob.transcode_n(4, BASE64URL, IDENTITY,
-				                   "+/+/" + req.http.foo);
+						   "+/+/" + req.http.foo);
 		}
 		elsif (req.url == "/6") {
 			set resp.http.bad
 			    = blob.transcode_n(8, BASE64URLNOPAD, IDENTITY,
-				                   "TWFu" + req.http.foo);
+						   "TWFu" + req.http.foo);
 		}
 		elsif (req.url == "/7") {
 			set resp.http.bad
 			    = blob.transcode_n(4, BASE64, BASE64,
-				                   "_-_-" + req.http.foo);
+						   "_-_-" + req.http.foo);
 		}
 		elsif (req.url == "/8") {
 			set resp.http.bad
 			    = blob.transcode_n(4, BASE64URL, BASE64URL,
-				                   "/+/+" + req.http.foo);
+						   "/+/+" + req.http.foo);
 		}
 		elsif (req.url == "/9") {
 			set resp.http.bad
 			    = blob.transcode_n(8, BASE64URLNOPAD,
-				                   BASE64URLNOPAD,
-				                   "Zm9v" + req.http.foo);
+						   BASE64URLNOPAD,
+						   "Zm9v" + req.http.foo);
 		}
 		elsif (req.url == "/10") {
 			set resp.http.bad


More information about the varnish-commit mailing list