VSB_quote(QUOTE_CSTR) should not indent with "\t" unless asked.

varnishcache · Jan 9, 2019 · 1425d2a · 1425d2a
1 parent 64e2ba2
commit 1425d2a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/lib/libvarnish/vsb.c b/lib/libvarnish/vsb.c
@@ -573,7 +573,7 @@ VSB_quote_pfx(struct vsb *s, const char *pfx, const void *v, int len, int how)
 			break;
 		case '\n':
 			if (how & VSB_QUOTE_CSTR) {
-				(void)VSB_printf(s, "\\n\"\n%s\t\"", pfx);
+				(void)VSB_printf(s, "\\n\"\n%s\"", pfx);
 			} else if (how & (VSB_QUOTE_NONL|VSB_QUOTE_UNSAFE)) {
 				(void)VSB_printf(s, "\n");
 				nl = 1;

diff --git a/lib/libvcc/vcc_compile.c b/lib/libvcc/vcc_compile.c
@@ -233,9 +233,8 @@ EmitCoordinates(const struct vcc *tl, struct vsb *vsb)
 	VTAILQ_FOREACH(sp, &tl->sources, list) {
 		VSB_printf(vsb, "    /* ");
 		VSB_quote(vsb, sp->name, -1, VSB_QUOTE_CSTR);
-		VSB_printf(vsb, "*/\n");
+		VSB_printf(vsb, " */\n");
-		VSB_printf(vsb, "\t");
+		VSB_quote_pfx(vsb, "\t", sp->b, sp->e - sp->b, VSB_QUOTE_CSTR);
-		VSB_quote(vsb, sp->b, sp->e - sp->b, VSB_QUOTE_CSTR);
 		VSB_printf(vsb, ",\n");
 	}
 	VSB_printf(vsb, "};\n\n");