Some constifications

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

diff --git a/varnish-cache/bin/varnishd/cache.h b/varnish-cache/bin/varnishd/cache.h
index af1a29450660da90d95225a7753942930f1f7f30..0993301db26e7a4ee404bcdaa6a1e1913d958ca5 100644 (file)
--- a/varnish-cache/bin/varnishd/cache.h
+++ b/varnish-cache/bin/varnishd/cache.h
@@ -564,7 +564,7 @@ void PipeSession(struct sess *sp);
 void WRK_Init(void);
 int WRK_Queue(struct workreq *wrq);
 void WRK_QueueSession(struct sess *sp);
-void WRK_SumStat(struct worker *w);
+void WRK_SumStat(const struct worker *w);
 
 void WRW_Reserve(struct worker *w, int *fd);
 void WRW_Release(struct worker *w);

diff --git a/varnish-cache/bin/varnishd/cache_hash.c b/varnish-cache/bin/varnishd/cache_hash.c
index cd0e12feac8a650bbf95983b29b8e34f5ca338c1..2ac8f6672dcbace8ff1f265747544629d558a5e5 100644 (file)
--- a/varnish-cache/bin/varnishd/cache_hash.c
+++ b/varnish-cache/bin/varnishd/cache_hash.c
@@ -162,7 +162,7 @@ HSH_Cleanup(struct worker *w)
 }
 
 void
-HSH_DeleteObjHead(struct worker *w, struct objhead *oh)
+HSH_DeleteObjHead(const struct worker *w, struct objhead *oh)
 {
 
        AZ(oh->refcnt);
@@ -478,7 +478,7 @@ HSH_Ref(struct object *o)
 }
 
 void
-HSH_Deref(struct worker *w, struct object **oo)
+HSH_Deref(const struct worker *w, struct object **oo)
 {
        struct object *o;
        struct objhead *oh;

diff --git a/varnish-cache/bin/varnishd/cache_pool.c b/varnish-cache/bin/varnishd/cache_pool.c
index 866af94388bd6939271cdb90cdcb86cabb336419..a45a7300eada578748c7304444a7ccc5176a6a27 100644 (file)
--- a/varnish-cache/bin/varnishd/cache_pool.c
+++ b/varnish-cache/bin/varnishd/cache_pool.c
@@ -266,12 +266,12 @@ WRW_Sendfile(struct worker *w, int fd, off_t off, unsigned len)
 /*--------------------------------------------------------------------*/
 
 static void
-wrk_sumstat(struct worker *w)
+wrk_sumstat(const struct worker *w)
 {
 
        Lck_AssertHeld(&wstat_mtx);
 #define L0(n)
-#define L1(n) VSL_stats->n += w->stats->n 
+#define L1(n) (VSL_stats->n += w->stats->n)
 #define MAC_STAT(n, t, l, f, d) L##l(n);
 #include "stat_field.h"
 #undef MAC_STAT
@@ -281,7 +281,7 @@ wrk_sumstat(struct worker *w)
 }
 
 void
-WRK_SumStat(struct worker *w)
+WRK_SumStat(const struct worker *w)
 {
        Lck_Lock(&wstat_mtx);
        wrk_sumstat(w);

diff --git a/varnish-cache/bin/varnishd/hash_slinger.h b/varnish-cache/bin/varnishd/hash_slinger.h
index c6f8df1596dfa8358171928116e1cfd648d0c285..602e3a302b6f51dfa581c731b88affc8951eae3d 100644 (file)
--- a/varnish-cache/bin/varnishd/hash_slinger.h
+++ b/varnish-cache/bin/varnishd/hash_slinger.h
@@ -100,6 +100,6 @@ struct objhead {
 };
 
 extern unsigned        save_hash;
-void HSH_DeleteObjHead(struct worker *w, struct objhead *oh);
-void HSH_Deref(struct worker *w, struct object **o);
+void HSH_DeleteObjHead(const struct worker *w, struct objhead *oh);
+void HSH_Deref(const struct worker *w, struct object **o);
 #endif /* VARNISH_CACHE_CHILD */