r1379 - trunk/varnish-cache/bin/varnishd

[des at projects.linpro.no]

Author: des
Date: 2007-05-03 10:48:43 +0200 (Thu, 03 May 2007)
New Revision: 1379

Modified:
   trunk/varnish-cache/bin/varnishd/storage_file.c
Log:
s/expl/reason/ to circumvent a bug in gcc 3.


Modified: trunk/varnish-cache/bin/varnishd/storage_file.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/storage_file.c	2007-05-03 08:45:33 UTC (rev 1378)
+++ trunk/varnish-cache/bin/varnishd/storage_file.c	2007-05-03 08:48:43 UTC (rev 1379)
@@ -119,7 +119,7 @@
 	uintmax_t l;
 	unsigned bs;
 	char suff[2];
-	int i, expl;
+	int i, explicit;
 	off_t o;
 	struct stat st;
 
@@ -140,7 +140,7 @@
 
 	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 @@
 		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."