apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pque...@apache.org
Subject svn commit: r893840 - in /apr/apr/trunk: include/apr_pools.h memory/unix/apr_pools.c
Date Fri, 25 Dec 2009 08:14:46 GMT
Author: pquerna
Date: Fri Dec 25 08:14:45 2009
New Revision: 893840

URL: http://svn.apache.org/viewvc?rev=893840&view=rev
Log:
Remove all deprecated pool*_core functions. (renamed to _unmanaged)

Modified:
    apr/apr/trunk/include/apr_pools.h
    apr/apr/trunk/memory/unix/apr_pools.c

Modified: apr/apr/trunk/include/apr_pools.h
URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/apr_pools.h?rev=893840&r1=893839&r2=893840&view=diff
==============================================================================
--- apr/apr/trunk/include/apr_pools.h (original)
+++ apr/apr/trunk/include/apr_pools.h Fri Dec 25 08:14:45 2009
@@ -199,14 +199,6 @@
                                              apr_allocator_t *allocator);
 
 /**
- * Create a new pool.
- * @deprecated @see apr_pool_create_unmanaged_ex.
- */
-APR_DECLARE(apr_status_t) apr_pool_create_core_ex(apr_pool_t **newpool,
-                                                  apr_abortfunc_t abort_fn,
-                                                  apr_allocator_t *allocator);
-
-/**
  * Create a new unmanaged pool.
  * @param newpool The pool we have just created.
  * @param abort_fn A function to use if the pool cannot allocate more memory.
@@ -254,16 +246,7 @@
                              APR_POOL__FILE_LINE__)
 #endif
 
-/**
- * Debug version of apr_pool_create_core_ex.
- * @deprecated @see apr_pool_create_unmanaged_ex_debug.
- */
-APR_DECLARE(apr_status_t) apr_pool_create_core_ex_debug(apr_pool_t **newpool,
-                                                   apr_abortfunc_t abort_fn,
-                                                   apr_allocator_t *allocator,
-                                                   const char *file_line);
-
-/**
+  /**
  * Debug version of apr_pool_create_unmanaged_ex.
  * @param newpool @see apr_pool_create_unmanaged.
  * @param abort_fn @see apr_pool_create_unmanaged.
@@ -275,8 +258,8 @@
  *         calls in a wrapper function and wish to override
  *         the file_line argument to reflect the caller of
  *         your wrapper function.  If you do not have
- *         apr_pool_create_core_ex in a wrapper, trust the macro
- *         and don't call apr_pool_create_core_ex_debug directly.
+ *         apr_pool_create_unmanaged_ex in a wrapper, trust the macro
+ *         and don't call apr_pool_create_unmanaged_ex_debug directly.
  */
 APR_DECLARE(apr_status_t) apr_pool_create_unmanaged_ex_debug(apr_pool_t **newpool,
                                                    apr_abortfunc_t abort_fn,
@@ -284,10 +267,6 @@
                                                    const char *file_line);
 
 #if APR_POOL_DEBUG
-#define apr_pool_create_core_ex(newpool, abort_fn, allocator)  \
-    apr_pool_create_unmanaged_ex_debug(newpool, abort_fn, allocator, \
-                                  APR_POOL__FILE_LINE__)
-
 #define apr_pool_create_unmanaged_ex(newpool, abort_fn, allocator)  \
     apr_pool_create_unmanaged_ex_debug(newpool, abort_fn, allocator, \
                                   APR_POOL__FILE_LINE__)
@@ -325,19 +304,13 @@
  * @param newpool The pool we have just created.
  */
 #if defined(DOXYGEN)
-APR_DECLARE(apr_status_t) apr_pool_create_core(apr_pool_t **newpool);
 APR_DECLARE(apr_status_t) apr_pool_create_unmanaged(apr_pool_t **newpool);
 #else
 #if APR_POOL_DEBUG
-#define apr_pool_create_core(newpool) \
-    apr_pool_create_unmanaged_ex_debug(newpool, NULL, NULL, \
-                                  APR_POOL__FILE_LINE__)
 #define apr_pool_create_unmanaged(newpool) \
     apr_pool_create_unmanaged_ex_debug(newpool, NULL, NULL, \
                                   APR_POOL__FILE_LINE__)
 #else
-#define apr_pool_create_core(newpool) \
-    apr_pool_create_unmanaged_ex(newpool, NULL, NULL)
 #define apr_pool_create_unmanaged(newpool) \
     apr_pool_create_unmanaged_ex(newpool, NULL, NULL)
 #endif

Modified: apr/apr/trunk/memory/unix/apr_pools.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/memory/unix/apr_pools.c?rev=893840&r1=893839&r2=893840&view=diff
==============================================================================
--- apr/apr/trunk/memory/unix/apr_pools.c (original)
+++ apr/apr/trunk/memory/unix/apr_pools.c Fri Dec 25 08:14:45 2009
@@ -914,15 +914,6 @@
     return APR_SUCCESS;
 }
 
-/* Deprecated. Renamed to apr_pool_create_unmanaged_ex
- */
-APR_DECLARE(apr_status_t) apr_pool_create_core_ex(apr_pool_t **newpool,
-                                                  apr_abortfunc_t abort_fn,
-                                                  apr_allocator_t *allocator)
-{
-    return apr_pool_create_unmanaged_ex(newpool, abort_fn, allocator);
-}
-
 APR_DECLARE(apr_status_t) apr_pool_create_unmanaged_ex(apr_pool_t **newpool,
                                                   apr_abortfunc_t abort_fn,
                                                   apr_allocator_t *allocator)
@@ -1747,15 +1738,6 @@
     return APR_SUCCESS;
 }
 
-APR_DECLARE(apr_status_t) apr_pool_create_core_ex_debug(apr_pool_t **newpool,
-                                                   apr_abortfunc_t abort_fn,
-                                                   apr_allocator_t *allocator,
-                                                   const char *file_line)
-{
-    return apr_pool_create_unmanaged_ex_debug(newpool, abort_fn, allocator,
-                                              file_line);
-}
-
 APR_DECLARE(apr_status_t) apr_pool_create_unmanaged_ex_debug(apr_pool_t **newpool,
                                                    apr_abortfunc_t abort_fn,
                                                    apr_allocator_t *allocator,
@@ -2526,14 +2508,6 @@
     return apr_pool_create_ex(newpool, parent, abort_fn, allocator);
 }
 
-APR_DECLARE(apr_status_t) apr_pool_create_core_ex_debug(apr_pool_t **newpool,
-                                                   apr_abortfunc_t abort_fn,
-                                                   apr_allocator_t *allocator,
-                                                   const char *file_line)
-{
-    return apr_pool_create_unmanaged_ex(newpool, abort_fn, allocator);
-}
-
 APR_DECLARE(apr_status_t) apr_pool_create_unmanaged_ex_debug(apr_pool_t **newpool,
                                                    apr_abortfunc_t abort_fn,
                                                    apr_allocator_t *allocator,
@@ -2592,19 +2566,6 @@
                                     "undefined");
 }
 
-#undef apr_pool_create_core_ex
-APR_DECLARE(apr_status_t) apr_pool_create_core_ex(apr_pool_t **newpool,
-                                                  apr_abortfunc_t abort_fn,
-                                                  apr_allocator_t *allocator);
-
-APR_DECLARE(apr_status_t) apr_pool_create_core_ex(apr_pool_t **newpool,
-                                                  apr_abortfunc_t abort_fn,
-                                                  apr_allocator_t *allocator)
-{
-    return apr_pool_create_unmanaged_ex_debug(newpool, abort_fn,
-                                         allocator, "undefined");
-}
-
 #undef apr_pool_create_unmanaged_ex
 APR_DECLARE(apr_status_t) apr_pool_create_unmanaged_ex(apr_pool_t **newpool,
                                                   apr_abortfunc_t abort_fn,



Mime
View raw message