r1378 - trunk/varnish-cache/bin/varnishd

[des at projects.linpro.no]

Author: des
Date: 2007-05-03 10:45:33 +0200 (Thu, 03 May 2007)
New Revision: 1378

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


Modified: trunk/varnish-cache/bin/varnishd/cache.h
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache.h	2007-05-03 08:41:01 UTC (rev 1377)
+++ trunk/varnish-cache/bin/varnishd/cache.h	2007-05-03 08:45:33 UTC (rev 1378)
@@ -275,7 +275,7 @@
 	unsigned 		handling;
 	unsigned char		wantbody;
 	int			err_code;
-	const char		*err_expl;
+	const char		*err_reason;
 
 	TAILQ_ENTRY(sess)	list;
 

Modified: trunk/varnish-cache/bin/varnishd/cache_center.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_center.c	2007-05-03 08:41:01 UTC (rev 1377)
+++ trunk/varnish-cache/bin/varnishd/cache_center.c	2007-05-03 08:45:33 UTC (rev 1378)
@@ -247,9 +247,9 @@
 cnt_error(struct sess *sp)
 {
 
-	RES_Error(sp, sp->err_code, sp->err_expl);
+	RES_Error(sp, sp->err_code, sp->err_reason);
 	sp->err_code = 0;
-	sp->err_expl = NULL;
+	sp->err_reason = NULL;
 	sp->step = STP_DONE;
 	return (0);
 }

Modified: trunk/varnish-cache/bin/varnishd/cache_vrt.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_vrt.c	2007-05-03 08:41:01 UTC (rev 1377)
+++ trunk/varnish-cache/bin/varnishd/cache_vrt.c	2007-05-03 08:45:33 UTC (rev 1378)
@@ -47,13 +47,13 @@
 /*--------------------------------------------------------------------*/
 
 void
-VRT_error(struct sess *sp, unsigned code, const char *expl)
+VRT_error(struct sess *sp, unsigned code, const char *reason)
 {
 
 	CHECK_OBJ_NOTNULL(sp, SESS_MAGIC);
-	WSL(sp->wrk, SLT_Debug, 0, "VCL_error(%u, %s)", code, expl);
+	WSL(sp->wrk, SLT_Debug, 0, "VCL_error(%u, %s)", code, reason);
 	sp->err_code = code;
-	sp->err_expl = expl;
+	sp->err_reason = reason;
 }
 
 /*--------------------------------------------------------------------*/