[master] e10a410 Make default_oc_methods static to stevedore.c

Poul-Henning Kamp phk at varnish-cache.org
Wed Mar 2 14:06:17 CET 2011


commit e10a410d14c15d249385983ec89a413493e61fa7
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Wed Mar 2 12:36:10 2011 +0000

    Make default_oc_methods static to stevedore.c

diff --git a/bin/varnishd/cache.h b/bin/varnishd/cache.h
index 9ca8034..05cdcf9 100644
--- a/bin/varnishd/cache.h
+++ b/bin/varnishd/cache.h
@@ -363,8 +363,6 @@ struct objcore_methods {
 	getlru_f	*getlru;
 };
 
-extern struct objcore_methods default_oc_methods;
-
 struct objcore {
 	unsigned		magic;
 #define OBJCORE_MAGIC		0x4d301302
diff --git a/bin/varnishd/stevedore.c b/bin/varnishd/stevedore.c
index 912fd68..9d16c6c 100644
--- a/bin/varnishd/stevedore.c
+++ b/bin/varnishd/stevedore.c
@@ -53,6 +53,7 @@ static VTAILQ_HEAD(, stevedore)	stevedores =
 static const struct stevedore * volatile stv_next;
 
 static struct stevedore *stv_transient;
+static struct objcore_methods default_oc_methods;
 
 /*--------------------------------------------------------------------
  */
@@ -339,7 +340,7 @@ default_oc_getlru(const struct objcore *oc)
 	return (o->objstore->stevedore->lru);
 }
 
-struct objcore_methods default_oc_methods = {
+static struct objcore_methods default_oc_methods = {
 	.getobj = default_oc_getobj,
 	.freeobj = default_oc_freeobj,
 	.getlru = default_oc_getlru,



More information about the varnish-commit mailing list