[master] d65d7c7 Fix spacing in an error message

Poul-Henning Kamp phk at varnish-cache.org
Mon Sep 23 21:09:36 CEST 2013


commit d65d7c73a2e6beb8b9a92f3535d596423963d28a
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon Sep 23 19:09:24 2013 +0000

    Fix spacing in an error message

diff --git a/bin/varnishtest/tests/m00003.vtc b/bin/varnishtest/tests/m00003.vtc
index 0251a77..d1e36c2 100644
--- a/bin/varnishtest/tests/m00003.vtc
+++ b/bin/varnishtest/tests/m00003.vtc
@@ -26,6 +26,6 @@ client c1 {
 	expect resp.http.bar == "foo"
 } -run
 
-varnish v1 -errvcl {Expected 'from path...'} {
+varnish v1 -errvcl {Expected 'from path ...'} {
 	import std to;
 }
diff --git a/bin/varnishtest/tests/m00008.vtc b/bin/varnishtest/tests/m00008.vtc
index 30d39b7..c9d2bd8 100644
--- a/bin/varnishtest/tests/m00008.vtc
+++ b/bin/varnishtest/tests/m00008.vtc
@@ -11,7 +11,7 @@ varnish v1 -vcl+backend {
 
 varnish v1 -cliok "param.set vcc_unsafe_path off"
 
-varnish v1 -errvcl {'import ... from path...' not allowed.} {
+varnish v1 -errvcl {'import ... from path ...' not allowed.} {
 	backend default { .host = "${s1_sock}"; }
 	import std from "${topbuild}/lib/libvmod_std/.libs/libvmod_std.so" ;
 }
diff --git a/lib/libvcc/vcc_vmod.c b/lib/libvcc/vcc_vmod.c
index 7eb9d32c..a2dc029 100644
--- a/lib/libvcc/vcc_vmod.c
+++ b/lib/libvcc/vcc_vmod.c
@@ -85,14 +85,13 @@ vcc_ParseImport(struct vcc *tl)
 	if (tl->t->tok == ID) {
 		if (!tl->unsafe_path) {
 			VSB_printf(tl->sb,
-			    "'import ... from path...'"
-			    " not allowed.\nAt:");
+			    "'import ... from path ...' not allowed.\nAt:");
 			vcc_ErrToken(tl, tl->t);
 			vcc_ErrWhere(tl, tl->t);
 			return;
 		}
 		if (!vcc_IdIs(tl->t, "from")) {
-			VSB_printf(tl->sb, "Expected 'from path...'\n");
+			VSB_printf(tl->sb, "Expected 'from path ...'\n");
 			vcc_ErrWhere(tl, tl->t);
 			return;
 		}



More information about the varnish-commit mailing list