axe these deprecated functions:

apr_allocator_get_mutex
apr_allocator_get_owner
apr_allocator_set_max_free
apr_allocator_set_mutex
apr_allocator_set_owner
apr_pool_get_abort
apr_pool_get_parent
apr_pool_set_abort
apr_pool_sub_make
apr_signal_get_description


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

8 files changed, 10 insertions, 119 deletions

diff --git a/CHANGES b/CHANGES
index 74dcf26df..4a0bc2de1 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3,10 +3,19 @@ Changes with APR 1.0
   *) The following deprecated interfaces have been removed:
 
      apr_accept                   -> apr_socket_accept
+     apr_allocator_get_mutex      -> apr_allocator_mutex_get
+     apr_allocator_get_owner      -> apr_allocator_owner_get
+     apr_allocator_set_max_free   -> apr_allocator_max_free_set
+     apr_allocator_set_mutex      -> apr_allocator_mutex_set
+     apr_allocator_set_owner      -> apr_allocator_owner_set
      apr_bind                     -> apr_socket_bind
      apr_connect                  -> apr_socket_connect
      apr_getsocketopt             -> apr_socket_opt_get
      apr_listen                   -> apr_socket_listen
+     apr_pool_get_abort           -> apr_pool_abort_get
+     apr_pool_get_parent          -> apr_pool_parent_get
+     apr_pool_set_abort           -> apr_pool_abort_set
+     apr_pool_sub_make            -> apr_pool_create_ex
      apr_recv                     -> apr_socket_recv
      apr_recvfrom                 -> apr_socket_recvfrom
      apr_send                     -> apr_socket_send
@@ -15,6 +24,7 @@ Changes with APR 1.0
      apr_sendv                    -> apr_socket_sendv
      apr_setsocketopt             -> apr_socket_opt_set
      apr_shutdown                 -> apr_socket_shutdown
+     apr_signal_get_description   -> apr_signal_description_get
      apr_socket_create_ex         -> apr_socket_create
      apr_socket_set_inherit       -> apr_socket_inherit_set
      apr_socket_unset_inherit     -> apr_socket_inherit_unset
diff --git a/include/apr_allocator.h b/include/apr_allocator.h
index cc58e647f..94d39177f 100644
--- a/include/apr_allocator.h
+++ b/include/apr_allocator.h
@@ -144,20 +144,12 @@ APR_DECLARE(void) apr_allocator_free(apr_allocator_t *allocator,
 APR_DECLARE(void) apr_allocator_owner_set(apr_allocator_t *allocator,
                                           apr_pool_t *pool);
 
-/** @deprecated @see apr_allocator_owner_set */
-APR_DECLARE(void) apr_allocator_set_owner(apr_allocator_t *allocator,
-                                          apr_pool_t *pool);
-
 /**
  * Get the current owner of the allocator
  * @param allocator The allocator to get the owner from
  */
 APR_DECLARE(apr_pool_t *) apr_allocator_owner_get(apr_allocator_t *allocator);
 
-/** @deprecated @see apr_allocator_owner_get */
-APR_DECLARE(apr_pool_t *) apr_allocator_get_owner(
-                                  apr_allocator_t *allocator);
-
 /**
  * Set the current threshold at which the allocator should start
  * giving blocks back to the system.
@@ -167,10 +159,6 @@ APR_DECLARE(apr_pool_t *) apr_allocator_get_owner(
 APR_DECLARE(void) apr_allocator_max_free_set(apr_allocator_t *allocator,
                                              apr_size_t size);
 
-/** @deprecated @see apr_allocator_max_free_set */
-APR_DECLARE(void) apr_allocator_set_max_free(apr_allocator_t *allocator,
-                                             apr_size_t size);
-
 #include "apr_thread_mutex.h"
 
 #if APR_HAS_THREADS
@@ -182,10 +170,6 @@ APR_DECLARE(void) apr_allocator_set_max_free(apr_allocator_t *allocator,
 APR_DECLARE(void) apr_allocator_mutex_set(apr_allocator_t *allocator,
                                           apr_thread_mutex_t *mutex);
 
-/** @deprecated @see apr_allocator_mutex_set */
-APR_DECLARE(void) apr_allocator_set_mutex(apr_allocator_t *allocator,
-                                          apr_thread_mutex_t *mutex);
-
 /**
  * Get the mutex currently set for the allocator
  * @param allocator The allocator
@@ -193,10 +177,6 @@ APR_DECLARE(void) apr_allocator_set_mutex(apr_allocator_t *allocator,
 APR_DECLARE(apr_thread_mutex_t *) apr_allocator_mutex_get(
                                       apr_allocator_t *allocator);
 
-/** @deprecated @see apr_allocator_mutex_get */
-APR_DECLARE(apr_thread_mutex_t *) apr_allocator_get_mutex(
-                                      apr_allocator_t *allocator);
-
 #endif /* APR_HAS_THREADS */
 
 /** @} */
diff --git a/include/apr_pools.h b/include/apr_pools.h
index a19fe5f1f..d43b83e7c 100644
--- a/include/apr_pools.h
+++ b/include/apr_pools.h
@@ -275,17 +275,6 @@ APR_DECLARE(apr_status_t) apr_pool_create(apr_pool_t **newpool,
 #endif
 #endif
 
-/** @deprecated @see apr_pool_create_ex */
-#if APR_POOL_DEBUG
-#define apr_pool_sub_make(newpool, parent, abort_fn) \
-    (void)apr_pool_create_ex_debug(newpool, parent, abort_fn, \
-                                   NULL, \
-                                   APR_POOL__FILE_LINE__)
-#else
-#define apr_pool_sub_make(newpool, parent, abort_fn) \
-    (void)apr_pool_create_ex(newpool, parent, abort_fn, NULL)
-#endif
-
 /**
  * Find the pools allocator
  * @param pool The pool to get the allocator from.
@@ -425,10 +414,6 @@ APR_DECLARE(void *) apr_pcalloc_debug(apr_pool_t *p, apr_size_t size,
 APR_DECLARE(void) apr_pool_abort_set(apr_abortfunc_t abortfunc,
                                      apr_pool_t *pool);
 
-/** @deprecated @see apr_pool_abort_set */
-APR_DECLARE(void) apr_pool_set_abort(apr_abortfunc_t abortfunc,
-                                     apr_pool_t *pool);
-
 /**
  * Get the abort function associated with the specified pool.
  * @param pool The pool for retrieving the abort function.
@@ -436,9 +421,6 @@ APR_DECLARE(void) apr_pool_set_abort(apr_abortfunc_t abortfunc,
  */
 APR_DECLARE(apr_abortfunc_t) apr_pool_abort_get(apr_pool_t *pool);
 
-/** @deprecated @see apr_pool_abort_get */
-APR_DECLARE(apr_abortfunc_t) apr_pool_get_abort(apr_pool_t *pool);
-
 /**
  * Get the parent pool of the specified pool.
  * @param pool The pool for retrieving the parent pool.
@@ -446,9 +428,6 @@ APR_DECLARE(apr_abortfunc_t) apr_pool_get_abort(apr_pool_t *pool);
  */
 APR_DECLARE(apr_pool_t *) apr_pool_parent_get(apr_pool_t *pool);
 
-/** @deprecated @see apr_pool_parent_get */
-APR_DECLARE(apr_pool_t *) apr_pool_get_parent(apr_pool_t *pool);
-
 /**
  * Determine if pool a is an ancestor of pool b
  * @param a The pool to search
diff --git a/include/apr_signal.h b/include/apr_signal.h
index 3ef45ec97..8e4f1495f 100644
--- a/include/apr_signal.h
+++ b/include/apr_signal.h
@@ -117,9 +117,6 @@ APR_DECLARE(apr_sigfunc_t *) apr_signal(int signo, apr_sigfunc_t * func);
  */
 APR_DECLARE(const char *) apr_signal_description_get(int signum);
 
-/** @deprecated @see apr_signal_description_get */
-APR_DECLARE(const char *) apr_signal_get_description(int signum);
-
 /**
  * APR-private function for initializing the signal package
  * @internal
diff --git a/memory/unix/apr_pools.c b/memory/unix/apr_pools.c
index d10012114..8f2372d76 100644
--- a/memory/unix/apr_pools.c
+++ b/memory/unix/apr_pools.c
@@ -2228,60 +2228,3 @@ 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 *) apr_allocator_get_owner(
-                                  apr_allocator_t *allocator)
-{
-    return apr_allocator_owner_get(allocator);
-}
-
-#if APR_HAS_THREADS
-/* 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);
-}
-#endif /* APR_HAS_THREADS */
-
diff --git a/threadproc/netware/signals.c b/threadproc/netware/signals.c
index aacd96e35..96c87868a 100644
--- a/threadproc/netware/signals.c
+++ b/threadproc/netware/signals.c
@@ -108,9 +108,3 @@ APR_DECLARE(apr_status_t) apr_setup_signal_thread(void)
 
     return rv;
 }
-
-/* Deprecated */
-const char *apr_signal_get_description(int signum)
-{
-    return apr_signal_description_get(signum);
-}
diff --git a/threadproc/unix/signals.c b/threadproc/unix/signals.c
index 0b7dbc333..2ff3007c0 100644
--- a/threadproc/unix/signals.c
+++ b/threadproc/unix/signals.c
@@ -463,9 +463,3 @@ APR_DECLARE(apr_status_t) apr_setup_signal_thread(void)
 }
 
 #endif
-
-/* Deprecated */
-const char *apr_signal_get_description(int signum)
-{
-    return apr_signal_description_get(signum);
-}
diff --git a/threadproc/win32/signals.c b/threadproc/win32/signals.c
index e83e009fb..a94ad3a2e 100644
--- a/threadproc/win32/signals.c
+++ b/threadproc/win32/signals.c
@@ -92,9 +92,3 @@ const char *apr_signal_description_get(int signum)
 {
     return "unknown signal (not supported)";
 }
-
-/* Deprecated */
-const char *apr_signal_get_description(int signum)
-{
-    return apr_signal_description_get(signum);
-}