[master] f1eef6edc Polish error messages

[Poul-Henning Kamp]

commit f1eef6edcc6fb478778c7a8fe47b298458419159
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Thu May 30 13:07:51 2019 +0000

    Polish error messages

diff --git a/lib/libvcc/vcc_symb.c b/lib/libvcc/vcc_symb.c
index 048efc896..e409f3920 100644
--- a/lib/libvcc/vcc_symb.c
+++ b/lib/libvcc/vcc_symb.c
@@ -396,7 +396,7 @@ VCC_SymbolGet(struct vcc *tl, vcc_kind_t kind, const char *e, const char *x)
 			VSB_printf(tl->sb, ")");
 		}
 		VSB_cat(tl->sb, "\nAt: ");
-		vcc_ErrWhere(tl, tl->t);
+		vcc_ErrWhere2(tl, tl->t, tn);
 		return (NULL);
 	}
 	if (kind != SYM_NONE && kind != sym->kind) {
diff --git a/lib/libvcc/vcc_var.c b/lib/libvcc/vcc_var.c
index 72931c6a0..c662947c8 100644
--- a/lib/libvcc/vcc_var.c
+++ b/lib/libvcc/vcc_var.c
@@ -46,8 +46,8 @@ vcc_Var_Wildcard(struct vcc *tl, struct symbol *parent, struct symbol *sym)
 	if (strlen(sym->name) >= 127) {
 		VSB_printf(tl->sb, "HTTP header (%.20s..) is too long.\n",
 		    sym->name);
-		VSB_cat(tl->sb, "\nAt: ");
-		vcc_ErrWhere(tl, tl->t);
+		tl->err = 1;
+		return;
 	}
 
 	AN(sym);