Collapse VCT checks

bin/varnishd/cache/cache_http.c

@@ -679,7 +679,7 @@ http_GetContentLength(const struct http *hp)
 	cl = 0;
 	if (!vct_isdigit(*b))
 		return (-2);
-	for (;vct_isdigit(*b); b++) {
+	for (; vct_isdigit(*b); b++) {
 		cll = cl;
 		cl *= 10;
 		cl += *b - '0';

lib/libvcc/vcc_var.c

@@ -66,7 +66,7 @@ vcc_Var_Wildcard(struct vcc *tl, struct symbol *parent,
 	AN(vsb);
 	VSB_printf(vsb, "&VGC_%s_", vh->rname);
 	for (p = b, u = 1; p < e; p++, u++)
-		if (vct_isalpha(*p) || vct_isdigit(*p))
+		if (vct_isalnum(*p))
 			VSB_putc(vsb, *p);
 		else
 			VSB_printf(vsb, "_%02x_", *p);