From: des <des@d4fa192b-c00b-0410-8231-f00ffab90ce4>
Date: Thu, 3 May 2007 08:48:43 +0000 (+0000)
Subject: s/expl/reason/ to circumvent a bug in gcc 3.
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=01370ea192b4fc276c9f7cab3425814dd2a6420b;p=varnish

s/expl/reason/ to circumvent a bug in gcc 3.


git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@1379 d4fa192b-c00b-0410-8231-f00ffab90ce4
---

diff --git a/varnish-cache/bin/varnishd/storage_file.c b/varnish-cache/bin/varnishd/storage_file.c
index 9fb728e3..57d49a4b 100644
--- a/varnish-cache/bin/varnishd/storage_file.c
+++ b/varnish-cache/bin/varnishd/storage_file.c
@@ -119,7 +119,7 @@ smf_calcsize(struct smf_sc *sc, const char *size, int newfile)
 	uintmax_t l;
 	unsigned bs;
 	char suff[2];
-	int i, expl;
+	int i, explicit;
 	off_t o;
 	struct stat st;
 
@@ -140,7 +140,7 @@ smf_calcsize(struct smf_sc *sc, const char *size, int newfile)
 
 	i = sscanf(size, "%ju%1s", &l, suff); /* can return -1, 0, 1 or 2 */
 
-	expl = i;
+	explicit = i;
 	if (i == 0) {
 		fprintf(stderr,
 		    "Error: (-sfile) size \"%s\" not understood\n", size);
@@ -215,7 +215,7 @@ smf_calcsize(struct smf_sc *sc, const char *size, int newfile)
 		exit (2);
 	}
 
-	if (expl < 3 && sizeof(void *) == 4 && l > INT32_MAX) {
+	if (explicit < 3 && sizeof(void *) == 4 && l > INT32_MAX) {
 		fprintf(stderr,
 		    "NB: Limiting size to 2GB on 32 bit architecture to"
 		    " prevent running out of\naddress space."