Qualify struct names

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 49e1e9cf295c79528ec062e53f6bf7dd6a225bcf..d0488bde744559b67fba9d8086244ded09ebb5aa 100644 (file)
--- 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
@@ -316,8 +316,8 @@ static int mod_conn_reconnect(void **handle, UNUSED rlm_cache_config_t const *co
        return 0;
 }
 
-extern cache_driver_t rlm_cache_memcached;
-cache_driver_t rlm_cache_memcached = {
+extern rlm_cache_driver_t rlm_cache_memcached;
+rlm_cache_driver_t rlm_cache_memcached = {
        .name           = "rlm_cache_memcached",
        .magic          = RLM_MODULE_INIT,
        .inst_size      = sizeof(rlm_cache_memcached_t),

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 75dea31c40942872cd6820dcf9b1986985e99dfd..cb19a6c2b75f7f30887839c4638c7720f755da66 100644 (file)
--- 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
@@ -347,8 +347,8 @@ static void cache_release(UNUSED rlm_cache_config_t const *config, void *instanc
        RDEBUG3("Mutex released");
 }
 
-extern cache_driver_t rlm_cache_rbtree;
-cache_driver_t rlm_cache_rbtree = {
+extern rlm_cache_driver_t rlm_cache_rbtree;
+rlm_cache_driver_t rlm_cache_rbtree = {
        .name           = "rlm_cache_rbtree",
        .magic          = RLM_MODULE_INIT,
        .instantiate    = mod_instantiate,

diff --git a/src/modules/rlm_cache/drivers/rlm_cache_redis/rlm_cache_redis.c b/src/modules/rlm_cache/drivers/rlm_cache_redis/rlm_cache_redis.c
index 5969e5eb61bfb99aae7b3224184ac7bc72efc84d..b1cf67d034d70128be048a7fa1be8b2b3908c8a6 100644 (file)
--- a/src/modules/rlm_cache/drivers/rlm_cache_redis/rlm_cache_redis.c
+++ b/src/modules/rlm_cache/drivers/rlm_cache_redis/rlm_cache_redis.c
@@ -464,8 +464,8 @@ static cache_status_t cache_entry_expire(UNUSED rlm_cache_config_t const *config
        return CACHE_ERROR;
 }
 
-extern cache_driver_t rlm_cache_redis;
-cache_driver_t rlm_cache_redis = {
+extern rlm_cache_driver_t rlm_cache_redis;
+rlm_cache_driver_t rlm_cache_redis = {
        .name           = "rlm_cache_redis",
        .magic          = RLM_MODULE_INIT,
        .onload         = mod_load,

diff --git a/src/modules/rlm_cache/rlm_cache.c b/src/modules/rlm_cache/rlm_cache.c
index 4c1aca4b2df869c2268c2ac097541f2dd77a5323..e17cb14bb16a81833eac08c9e55bc17c8c48730b 100644 (file)
--- a/src/modules/rlm_cache/rlm_cache.c
+++ b/src/modules/rlm_cache/rlm_cache.c
@@ -936,7 +936,7 @@ static int mod_bootstrap(void *instance, CONF_SECTION *conf)
                cf_log_err(driver_cs, "Failed loading driver");
                return -1;
        }
-       inst->driver = (cache_driver_t const *)inst->driver_inst->dl_inst->module->common;
+       inst->driver = (rlm_cache_driver_t const *)inst->driver_inst->dl_inst->module->common;
 
        /*
         *      Sanity check for crazy people.

diff --git a/src/modules/rlm_cache/rlm_cache.h b/src/modules/rlm_cache/rlm_cache.h
index 2bce1a3cb1fc337c21b681af995bdf9fde3f7c80..8211adf7a675adceae55768321fd6be81d2134a0 100644 (file)
--- a/src/modules/rlm_cache/rlm_cache.h
+++ b/src/modules/rlm_cache/rlm_cache.h
@@ -29,7 +29,7 @@ RCSIDH(cache_h, "$Id$")
 #include <freeradius-devel/server/dl_module.h>
 #include <freeradius-devel/server/map.h>
 
-typedef struct cache_driver cache_driver_t;
+typedef struct rlm_cache_driver_s rlm_cache_driver_t;
 
 typedef void rlm_cache_handle_t;
 
@@ -68,7 +68,7 @@ typedef struct {
        rlm_cache_config_t      config;                 //!< Must come first because of icky hacks.
 
        module_instance_t       *driver_inst;           //!< Driver's instance data.
-       cache_driver_t const    *driver;                //!< Driver's exported interface.
+       rlm_cache_driver_t const        *driver;                //!< Driver's exported interface.
 
        vp_map_t                *maps;                  //!< Attribute map applied to users.
                                                        //!< and profiles.
@@ -263,7 +263,7 @@ typedef void                (*cache_release_t)(rlm_cache_config_t const *config, void *instanc
 typedef int            (*cache_reconnect_t)(rlm_cache_handle_t **handle, rlm_cache_config_t const *config,
                                             void *instance, REQUEST *request);
 
-struct cache_driver {
+struct rlm_cache_driver_s {
        DL_MODULE_COMMON;                                       //!< Common fields for all loadable modules.
        FR_MODULE_COMMON;                                       //!< Common fields for all instantiated modules.
        FR_MODULE_THREADED_COMMON;                              //!< Common fields for threaded modules.