[asterisk-commits] rmudgett: branch rmudgett/ao2_enhancements r371465 - in /team/rmudgett/ao2_en...

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Fri Aug 17 13:04:14 2012
New Revision: 371465

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=371465
Log:
Remove legacy container alloc API calls obsoleted by these enhancements.

Modified:
    team/rmudgett/ao2_enhancements/include/asterisk/astobj2.h
    team/rmudgett/ao2_enhancements/main/astobj2.c

Modified: team/rmudgett/ao2_enhancements/include/asterisk/astobj2.h
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/ao2_enhancements/include/asterisk/astobj2.h?view=diff&rev=371465&r1=371464&r2=371465
==============================================================================
--- team/rmudgett/ao2_enhancements/include/asterisk/astobj2.h (original)
+++ team/rmudgett/ao2_enhancements/include/asterisk/astobj2.h Fri Aug 17 13:04:14 2012
@@ -1103,13 +1103,6 @@
 	ao2_t_container_alloc_options(AO2_ALLOC_OPT_LOCK_MUTEX, (n_buckets), (hash_fn), (cmp_fn), (tag))
 #define ao2_container_alloc(n_buckets, hash_fn, cmp_fn) \
 	ao2_container_alloc_options(AO2_ALLOC_OPT_LOCK_MUTEX, (n_buckets), (hash_fn), (cmp_fn))
-
-/* BUGBUG for legacy precompiled modules. Should be able to remove since it is trunk. */
-struct ao2_container *__ao2_container_alloc(unsigned int options,
-	unsigned int n_buckets, ao2_hash_fn *hash_fn, ao2_callback_fn *cmp_fn);
-struct ao2_container *__ao2_container_alloc_debug(unsigned int options,
-	unsigned int n_buckets, ao2_hash_fn *hash_fn, ao2_callback_fn *cmp_fn,
-	const char *tag, const char *file, int line, const char *func, int ref_debug);
 
 /*!
  * \brief Allocate and initialize a hash container with the desired number of buckets.

Modified: team/rmudgett/ao2_enhancements/main/astobj2.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/ao2_enhancements/main/astobj2.c?view=diff&rev=371465&r1=371464&r2=371465
==============================================================================
--- team/rmudgett/ao2_enhancements/main/astobj2.c (original)
+++ team/rmudgett/ao2_enhancements/main/astobj2.c Fri Aug 17 13:04:14 2012
@@ -2869,20 +2869,6 @@
 		sort_fn, cmp_fn, tag, file, line, func, ref_debug);
 }
 
-struct ao2_container *__ao2_container_alloc(unsigned int options,
-	unsigned int n_buckets, ao2_hash_fn *hash_fn, ao2_callback_fn *cmp_fn)
-{
-	return __ao2_container_alloc_hash(options, 0, n_buckets, hash_fn, NULL, cmp_fn);
-}
-
-struct ao2_container *__ao2_container_alloc_debug(unsigned int options,
-	unsigned int n_buckets, ao2_hash_fn *hash_fn, ao2_callback_fn *cmp_fn,
-	const char *tag, const char *file, int line, const char *func, int ref_debug)
-{
-	return __ao2_container_alloc_hash_debug(options, 0, n_buckets, hash_fn, NULL, cmp_fn,
-		tag, file, line, func, ref_debug);
-}
-
 /*! BUGBUG need to add red-black tree container support */
 
 #ifdef AO2_DEBUG