Rename more functions

diff --git a/src/include/pool.h b/src/include/pool.h
index 06355a1b9fa5e6558b16f44c293b53aa3ae9c72f..2a9a9ec142159bca7f1338fc7be765020eafcc2e 100644 (file)
--- a/src/include/pool.h
+++ b/src/include/pool.h
@@ -142,9 +142,9 @@ void        fr_pool_enable_triggers(fr_pool_t *pool,
 
 struct timeval fr_pool_timeout(fr_pool_t *pool);
 
-void const *fr_pool_connection_opaque(fr_pool_t *pool);
+void const *fr_pool_opaque(fr_pool_t *pool);
 
-void   fr_pool_connection_ref(fr_pool_t *pool);
+void   fr_pool_ref(fr_pool_t *pool);
 
 fr_pool_state_t const *fr_pool_state(fr_pool_t *pool);
 

diff --git a/src/main/modules.c b/src/main/modules.c
index a4dbeaedaf0a9f7c86a6efb4538566b232cfd6d7..b5705373c24ecf50c15a84c286bf71b278a7aa63 100644 (file)
--- a/src/main/modules.c
+++ b/src/main/modules.c
@@ -332,7 +332,7 @@ fr_pool_t *module_connection_pool_init(CONF_SECTION *module,
                cf_data_add(cs, pool, NULL, false);
                return pool;
        }
-       fr_pool_connection_ref(pool);
+       fr_pool_ref(pool);
 
        DEBUG4("%s: Found pool reference %p in config item \"%s.pool\"", log_prefix, pool, parent_name(cs));
 

diff --git a/src/main/pool.c b/src/main/pool.c
index 2256b7dd6f9046b0161f65d0bfe4a6eb3c71fd81..a955b948a4471b89ff8ff99571a8a59db1b45886 100644 (file)
--- a/src/main/pool.c
+++ b/src/main/pool.c
@@ -1161,7 +1161,7 @@ struct timeval fr_pool_timeout(fr_pool_t *pool)
  * @param pool to return data for.
  * @return opaque data associated with pool.
  */
-void const *fr_pool_connection_opaque(fr_pool_t *pool)
+void const *fr_pool_opaque(fr_pool_t *pool)
 {
        return pool->opaque;
 }
@@ -1170,7 +1170,7 @@ void const *fr_pool_connection_opaque(fr_pool_t *pool)
  *
  * @param[in] pool to increment reference counter for.
  */
-void fr_pool_connection_ref(fr_pool_t *pool)
+void fr_pool_ref(fr_pool_t *pool)
 {
        pool->ref++;
 }