From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Sat, 16 May 2015 22:32:59 +0000 (-0400)
Subject: Use C99 initialisers for cache drivers too
X-Git-Tag: release_3_0_9~343
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7f976f61ec306abc7711fc08d5664a9d60f8607c;p=thirdparty%2Ffreeradius-server.git

Use C99 initialisers for cache drivers too
---

diff --git a/src/modules/rlm_cache/drivers/rlm_cache_memcached/rlm_cache_memcached.c b/src/modules/rlm_cache/drivers/rlm_cache_memcached/rlm_cache_memcached.c
index ffaa15b0f58..65b42474d2f 100644
--- a/src/modules/rlm_cache/drivers/rlm_cache_memcached/rlm_cache_memcached.c
+++ b/src/modules/rlm_cache/drivers/rlm_cache_memcached/rlm_cache_memcached.c
@@ -334,16 +334,15 @@ static int mod_conn_reconnect(rlm_cache_t *inst, UNUSED REQUEST *request, rlm_ca
 
 extern cache_module_t rlm_cache_memcached;
 cache_module_t rlm_cache_memcached = {
-	"rlm_cache_memcached",
-	mod_instantiate,
-	NULL,			/* alloc */
-	cache_entry_free,
-	cache_entry_find,
-	cache_entry_insert,
-	cache_entry_expire,
-	NULL,			/* count */
-
-	mod_conn_get,
-	mod_conn_release,
-	mod_conn_reconnect
+	.name		= "rlm_cache_memcached",
+	.instantiate	= mod_instantiate,
+	.free		= cache_entry_free,
+
+	.find		= cache_entry_find,
+	.insert		= cache_entry_insert,
+	.expire		= cache_entry_expire,
+
+	.acquire	= mod_conn_get,
+	.release	= mod_conn_release,
+	.reconnect	= mod_conn_reconnect
 };
diff --git a/src/modules/rlm_cache/drivers/rlm_cache_rbtree/rlm_cache_rbtree.c b/src/modules/rlm_cache/drivers/rlm_cache_rbtree/rlm_cache_rbtree.c
index c79f1b07ea3..2db7c93b809 100644
--- a/src/modules/rlm_cache/drivers/rlm_cache_rbtree/rlm_cache_rbtree.c
+++ b/src/modules/rlm_cache/drivers/rlm_cache_rbtree/rlm_cache_rbtree.c
@@ -337,16 +337,15 @@ static void cache_release(UNUSED rlm_cache_t *inst, REQUEST *request, rlm_cache_
 
 extern cache_module_t rlm_cache_rbtree;
 cache_module_t rlm_cache_rbtree = {
-	"rlm_cache_rbtree",
-	mod_instantiate,
-	cache_entry_alloc,
-	NULL,			/* free */
-	cache_entry_find,
-	cache_entry_insert,
-	cache_entry_expire,
-	cache_entry_count,
-
-	cache_acquire,
-	cache_release,
-	NULL			/* no reconnect method */
+	.name		= "rlm_cache_rbtree",
+	.instantiate	= mod_instantiate,
+	.alloc		= cache_entry_alloc,
+
+	.find		= cache_entry_find,
+	.insert		= cache_entry_insert,
+	.expire		= cache_entry_expire,
+	.count		= cache_entry_count,
+
+	.acquire	= cache_acquire,
+	.release	= cache_release,
 };
diff --git a/src/modules/rlm_cache/rlm_cache.c b/src/modules/rlm_cache/rlm_cache.c
index 54ec5f3595f..42e2b92ed9b 100644
--- a/src/modules/rlm_cache/rlm_cache.c
+++ b/src/modules/rlm_cache/rlm_cache.c
@@ -737,7 +737,7 @@ static int mod_instantiate(CONF_SECTION *conf, void *instance)
 	rad_assert(inst->module->insert);
 	rad_assert(inst->module->expire);
 
-	if (inst->module->mod_instantiate) {
+	if (inst->module->instantiate) {
 		CONF_SECTION *cs;
 		char const *name;
 
@@ -760,7 +760,7 @@ static int mod_instantiate(CONF_SECTION *conf, void *instance)
 		 *	Should write its instance data in inst->driver,
 		 *	and parent it off of inst.
 		 */
-		if (inst->module->mod_instantiate(cs, inst) < 0) return -1;
+		if (inst->module->instantiate(cs, inst) < 0) return -1;
 	}
 
 	rad_assert(inst->key && *inst->key);
diff --git a/src/modules/rlm_cache/rlm_cache.h b/src/modules/rlm_cache/rlm_cache.h
index a7e0abf2397..10f6a4c824d 100644
--- a/src/modules/rlm_cache/rlm_cache.h
+++ b/src/modules/rlm_cache/rlm_cache.h
@@ -77,7 +77,7 @@ typedef struct rlm_cache_entry_t {
 	VALUE_PAIR		*state;			//!< Cached session-state list.
 } rlm_cache_entry_t;
 
-typedef int			(*mod_instantiate_t)(CONF_SECTION *conf, rlm_cache_t *inst);
+typedef int			(*cache_instantiate_t)(CONF_SECTION *conf, rlm_cache_t *inst);
 typedef rlm_cache_entry_t	*(*cache_entry_alloc_t)(rlm_cache_t *inst, REQUEST *request);
 typedef void			(*cache_entry_free_t)(rlm_cache_entry_t *c);
 
@@ -97,7 +97,7 @@ typedef int			(*cache_reconnect_t)(rlm_cache_t *inst, REQUEST *request, rlm_cach
 struct cache_module {
 	char const		*name;			//!< Driver name.
 
-	mod_instantiate_t	mod_instantiate;	//!< (optional) Instantiate a driver.
+	cache_instantiate_t	instantiate;		//!< (optional) Instantiate a driver.
 	cache_entry_alloc_t	alloc;			//!< (optional) Allocate a new entry.
 	cache_entry_free_t	free;			//!< (optional) Free memory used by an entry.