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 fa46eeac89e09d2d0118bf0a97ad8099eae8d35f..13ee72a3ecc6d1e90b36d7f3aff5a23c205b9e7a 100644 (file)
--- 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 d510dc859436cdf6f8cd9bec06815b8b7941caad..1d810743078fefa30b51a002cab8a5b086728bf4 100644 (file)
--- 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 5e52f421c8cbf1dd664d29e7f6c20543dd6d4f82..11b2c5d723b56c8cbfb467a66d58afa2310fe7e3 100644 (file)
--- 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;
 }
 
 /*--------------------------------------------------------------------*/