[master] eba8c98 Rename a variable to get rid of 'shadows global declaration' warning

Martin Blix Grydeland martin at varnish-cache.org
Wed May 15 15:34:44 CEST 2013


commit eba8c98e4208bc36aa7ffb71042d146f948705e7
Author: Martin Blix Grydeland <martin at varnish-software.com>
Date:   Wed May 15 15:34:09 2013 +0200

    Rename a variable to get rid of 'shadows global declaration' warning

diff --git a/lib/libvarnishapi/vsl_dispatch.c b/lib/libvarnishapi/vsl_dispatch.c
index 7053500..8256352 100644
--- a/lib/libvarnishapi/vsl_dispatch.c
+++ b/lib/libvarnishapi/vsl_dispatch.c
@@ -495,18 +495,18 @@ vtx_check_ready(struct VSLQ *vslq, struct vtx *vtx)
 }
 
 static int
-vtx_parsetag_bl(const char *str, unsigned strlen, enum VSL_transaction_e *ptype,
+vtx_parsetag_bl(const char *str, unsigned len, enum VSL_transaction_e *ptype,
     unsigned *pvxid)
 {
-	char ibuf[strlen + 1];
+	char ibuf[len + 1];
 	char tbuf[7];
 	unsigned vxid;
 	int i;
 	enum VSL_transaction_e type = VSL_t_unknown;
 
 	AN(str);
-	memcpy(ibuf, str, strlen);
-	ibuf[strlen] = '\0';
+	memcpy(ibuf, str, len);
+	ibuf[len] = '\0';
 	i = sscanf(ibuf, "%6s %u", tbuf, &vxid);
 	if (i < 1)
 		return (-1);



More information about the varnish-commit mailing list