[6.0] f3c0d915c VSB_quote(QUOTE_CSTR) should not indent with "\t" unless asked.
Dridi Boukelmoune
dridi.boukelmoune at gmail.com
Thu Jun 27 17:05:10 UTC 2019
commit f3c0d915cf16269245b961779c24f0d1cc5fb0e6
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date: Wed Jan 9 09:37:39 2019 +0000
VSB_quote(QUOTE_CSTR) should not indent with "\t" unless asked.
diff --git a/lib/libvarnish/vsb.c b/lib/libvarnish/vsb.c
index b44323854..1261ee57d 100644
--- a/lib/libvarnish/vsb.c
+++ b/lib/libvarnish/vsb.c
@@ -574,7 +574,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
index c0ee7b0bb..71016bc89 100644
--- a/lib/libvcc/vcc_compile.c
+++ b/lib/libvcc/vcc_compile.c
@@ -234,9 +234,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, "\t");
- VSB_quote(vsb, sp->b, sp->e - sp->b, VSB_QUOTE_CSTR);
+ VSB_printf(vsb, " */\n");
+ VSB_quote_pfx(vsb, "\t", sp->b, sp->e - sp->b, VSB_QUOTE_CSTR);
VSB_printf(vsb, ",\n");
}
VSB_printf(vsb, "};\n\n");
More information about the varnish-commit
mailing list