From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Mon, 5 Jun 2017 00:55:56 +0000 (-0400)
Subject: Rename more functions
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ef489edec607140ec77615deb383367482a5a143;p=thirdparty%2Ffreeradius-server.git

Rename more functions
---

diff --git a/src/include/pool.h b/src/include/pool.h
index 06355a1b9fa..2a9a9ec1421 100644
--- 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 a4dbeaedaf0..b5705373c24 100644
--- 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 2256b7dd6f9..a955b948a44 100644
--- 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++;
 }