From: des <des@d4fa192b-c00b-0410-8231-f00ffab90ce4>
Date: Thu, 3 May 2007 08:45:33 +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=63cba3aac3867bdc9ffeb9f194f5f64397eeb13b;p=varnish

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


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

diff --git a/varnish-cache/bin/varnishd/cache.h b/varnish-cache/bin/varnishd/cache.h
index fa46eeac..13ee72a3 100644
--- a/varnish-cache/bin/varnishd/cache.h
+++ b/varnish-cache/bin/varnishd/cache.h
@@ -275,7 +275,7 @@ struct sess {
 	unsigned 		handling;
 	unsigned char		wantbody;
 	int			err_code;
-	const char		*err_expl;
+	const char		*err_reason;
 
 	TAILQ_ENTRY(sess)	list;
 
diff --git a/varnish-cache/bin/varnishd/cache_center.c b/varnish-cache/bin/varnishd/cache_center.c
index d510dc85..1d810743 100644
--- a/varnish-cache/bin/varnishd/cache_center.c
+++ b/varnish-cache/bin/varnishd/cache_center.c
@@ -247,9 +247,9 @@ static int
 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);
 }
diff --git a/varnish-cache/bin/varnishd/cache_vrt.c b/varnish-cache/bin/varnishd/cache_vrt.c
index 5e52f421..11b2c5d7 100644
--- a/varnish-cache/bin/varnishd/cache_vrt.c
+++ b/varnish-cache/bin/varnishd/cache_vrt.c
@@ -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;
 }
 
 /*--------------------------------------------------------------------*/