More API get/set renames, and providing stubs for those previously

  renamed without thunks.


git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@63477 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 58 insertions, 4 deletions

diff --git a/memory/unix/apr_pools.c b/memory/unix/apr_pools.c
index cdcc3a602..27fd52b0e 100644
--- a/memory/unix/apr_pools.c
+++ b/memory/unix/apr_pools.c
@@ -166,7 +166,7 @@ APR_DECLARE(apr_pool_t *) apr_allocator_owner_get(apr_allocator_t *allocator)
     return allocator->owner;
 }
 
-APR_DECLARE(void) apr_allocator_set_max_free(apr_allocator_t *allocator,
+APR_DECLARE(void) apr_allocator_max_free_set(apr_allocator_t *allocator,
                                              apr_size_t size)
 {
     apr_uint32_t max_free_index;
@@ -1734,18 +1734,18 @@ APR_DECLARE_NONSTD(char *) apr_psprintf(apr_pool_t *p, const char *fmt, ...)
  * Pool Properties
  */
 
-APR_DECLARE(void) apr_pool_set_abort(apr_abortfunc_t abort_fn,
+APR_DECLARE(void) apr_pool_abort_set(apr_abortfunc_t abort_fn,
                                      apr_pool_t *pool)
 {
     pool->abort_fn = abort_fn;
 }
 
-APR_DECLARE(apr_abortfunc_t) apr_pool_get_abort(apr_pool_t *pool)
+APR_DECLARE(apr_abortfunc_t) apr_pool_abort_get(apr_pool_t *pool)
 {
     return pool->abort_fn;
 }
 
-APR_DECLARE(apr_pool_t *) apr_pool_get_parent(apr_pool_t *pool)
+APR_DECLARE(apr_pool_t *) apr_pool_parent_get(apr_pool_t *pool)
 {
     return pool->parent;
 }
@@ -2172,3 +2172,57 @@ APR_DECLARE(apr_status_t) apr_pool_create_ex(apr_pool_t **newpool,
 }
 
 #endif /* APR_POOL_DEBUG */
+
+/* Deprecated */
+APR_DECLARE(void) apr_allocator_set_max_free(apr_allocator_t *allocator,
+                                             apr_size_t size)
+{
+    apr_allocator_max_free_set(allocator, size);
+}
+
+/* Deprecated */
+APR_DECLARE(void) apr_pool_set_abort(apr_abortfunc_t abort_fn,
+                                     apr_pool_t *pool)
+{
+    apr_pool_abort_set(abort_fn, pool);
+}
+
+/* Deprecated */
+APR_DECLARE(apr_abortfunc_t) apr_pool_get_abort(apr_pool_t *pool)
+{
+    return apr_pool_abort_get(pool);
+}
+
+/* Deprecated */
+APR_DECLARE(apr_pool_t *) apr_pool_get_parent(apr_pool_t *pool)
+{
+    return apr_pool_parent_get(pool);
+}
+
+/* Deprecated */
+APR_DECLARE(void) apr_allocator_set_owner(apr_allocator_t *allocator,
+                                          apr_pool_t *pool)
+{
+    apr_allocator_owner_set(allocator, *pool);
+}
+
+/* Deprecated */
+APR_DECLARE(apr_pool_t *pool) apr_allocator_get_owner(
+                                  apr_allocator_t *allocator);
+{
+    return apr_allocator_owner_get(allocator);
+}
+
+/* Deprecated */
+APR_DECLARE(apr_thread_mutex_t *) apr_allocator_get_mutex(
+                                      apr_allocator_t *allocator)
+{
+    return apr_allocator_mutex_get(allocator);
+}
+
+/* Deprecated */
+APR_DECLARE(void) apr_allocator_set_mutex(apr_allocator_t *allocator,
+                                          apr_thread_mutex_t *mutex)
+{
+    apr_allocator_mutex_set(allocator, mutex);
+}