From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Sat, 16 May 2015 22:25:15 +0000 (-0400)
Subject: Rename xlat_name -> name in rlm_cache
X-Git-Tag: release_3_0_9~344
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=de5035838da5ad728cdcff7512e2129db733517b;p=thirdparty%2Ffreeradius-server.git

Rename xlat_name -> name in rlm_cache
---

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 15fda859cdd..ffaa15b0f58 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
@@ -142,7 +142,7 @@ static int mod_instantiate(CONF_SECTION *conf, rlm_cache_t *inst)
 
 	inst->driver = driver;
 
-	snprintf(buffer, sizeof(buffer), "rlm_cache (%s)", inst->xlat_name);
+	snprintf(buffer, sizeof(buffer), "rlm_cache (%s)", inst->name);
 
 	driver->pool = fr_connection_pool_module_init(conf, inst, mod_conn_create, NULL, buffer);
 	if (!driver->pool) return -1;
diff --git a/src/modules/rlm_cache/rlm_cache.c b/src/modules/rlm_cache/rlm_cache.c
index 97576254dec..54ec5f3595f 100644
--- a/src/modules/rlm_cache/rlm_cache.c
+++ b/src/modules/rlm_cache/rlm_cache.c
@@ -679,13 +679,13 @@ static int mod_bootstrap(CONF_SECTION *conf, void *instance)
 
 	inst->cs = conf;
 
-	inst->xlat_name = cf_section_name2(conf);
-	if (!inst->xlat_name) inst->xlat_name = cf_section_name1(conf);
+	inst->name = cf_section_name2(conf);
+	if (!inst->name) inst->name = cf_section_name1(conf);
 
 	/*
 	 *	Register the cache xlat function
 	 */
-	xlat_register(inst->xlat_name, cache_xlat, NULL, inst);
+	xlat_register(inst->name, cache_xlat, NULL, inst);
 
 	return 0;
 }
@@ -726,7 +726,7 @@ static int mod_instantiate(CONF_SECTION *conf, void *instance)
 		return -1;
 	}
 
-	INFO("rlm_cache (%s): Driver %s (module %s) loaded and linked", inst->xlat_name,
+	INFO("rlm_cache (%s): Driver %s (module %s) loaded and linked", inst->name,
 	     inst->driver_name, inst->module->name);
 
 	/*
diff --git a/src/modules/rlm_cache/rlm_cache.h b/src/modules/rlm_cache/rlm_cache.h
index 0d828beb582..a7e0abf2397 100644
--- a/src/modules/rlm_cache/rlm_cache.h
+++ b/src/modules/rlm_cache/rlm_cache.h
@@ -47,7 +47,7 @@ typedef enum {
  *	be used as the instance handle.
  */
 typedef struct rlm_cache_t {
-	char const		*xlat_name;		//!< Name of xlat function to register.
+	char const		*name;		//!< Name of xlat function to register.
 
 	char const		*driver_name;		//!< Datastore name
 	void			*handle;		//!< Datastore handle.