[master] a0b34bd Collapse VCT checks

Dridi Boukelmoune dridi.boukelmoune at gmail.com
Tue Jun 27 15:02:06 CEST 2017


commit a0b34bd410447aa6082bfeffd55567b2c97b5649
Author: Dridi Boukelmoune <dridi.boukelmoune at gmail.com>
Date:   Tue Jun 27 15:01:22 2017 +0200

    Collapse VCT checks

diff --git a/bin/varnishd/cache/cache_http.c b/bin/varnishd/cache/cache_http.c
index 9be4805..e1b9117 100644
--- a/bin/varnishd/cache/cache_http.c
+++ b/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';
diff --git a/lib/libvcc/vcc_var.c b/lib/libvcc/vcc_var.c
index 9e4c8cb..6428b86 100644
--- a/lib/libvcc/vcc_var.c
+++ b/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);



More information about the varnish-commit mailing list