[master] 2a29afd polishing

[Poul-Henning Kamp]

commit 2a29afdbe38f11892fe35ec4e545f6214b9e766b
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Wed Oct 24 15:02:30 2012 +0000

    polishing

diff --git a/lib/libvcl/vcc_expr.c b/lib/libvcl/vcc_expr.c
index 3c0599c..9e0f360 100644
--- a/lib/libvcl/vcc_expr.c
+++ b/lib/libvcl/vcc_expr.c
@@ -819,13 +819,14 @@ vcc_expr_add(struct vcc *tl, struct expr **e, enum var_type fmt)
 		return;
 
 	switch(f2) {
-	case STRING:		break;
-	case STRING_LIST:	break;
+	case STRING:
+	case STRING_LIST:
+		vcc_expr_string_add(tl, e);
+		return;
 	case INT:		break;
 	case TIME:		break;
 	case DURATION:		break;
 	case BYTES:		break;
-	case HEADER:		break;
 	default:
 		VSB_printf(tl->sb, "Operator %.*s not possible on type %s.\n",
 		    PF(tl->t), vcc_Type(f2));
@@ -833,11 +834,6 @@ vcc_expr_add(struct vcc *tl, struct expr **e, enum var_type fmt)
 		return;
 	}
 
-	if (f2 == STRING || f2 == STRING_LIST) {
-		vcc_expr_string_add(tl, e);
-		return;
-	}
-
 	while (tl->t->tok == '+' || tl->t->tok == '-') {
 		if (f2 == TIME)
 			f2 = DURATION;