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

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Fri Aug 17 13:22:06 2012
New Revision: 371467

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=371467
Log:
Remove tree container mentions for this branch.

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=371467&r1=371466&r2=371467
==============================================================================
--- team/rmudgett/ao2_enhancements/include/asterisk/astobj2.h (original)
+++ team/rmudgett/ao2_enhancements/include/asterisk/astobj2.h Fri Aug 17 13:22:06 2012
@@ -929,24 +929,6 @@
 	OBJ_ORDER_ASCENDING = (0 << 8),
 	/*! \brief Traverse in descending order (Last to first container object) */
 	OBJ_ORDER_DESCENDING = (1 << 8),
-	/*!
-	 * \brief Traverse in pre-order (Node then childeren, for tree container)
-	 *
-	 * \note For non-tree containers, it is up to the container type
-	 * to make the best interpretation of the order.  For list and
-	 * hash containers, this also means ascending order because a
-	 * binary tree can degenerate into a list.
-	 */
-	OBJ_ORDER_PRE = (2 << 8),
-	/*!
-	 * \brief Traverse in post-order (Childeren then node, for tree container)
-	 *
-	 * \note For non-tree containers, it is up to the container type
-	 * to make the best interpretation of the order.  For list and
-	 * hash containers, this also means descending order because a
-	 * binary tree can degenerate into a list.
-	 */
-	OBJ_ORDER_POST = (3 << 8),
 };
 
 /*!
@@ -1197,49 +1179,6 @@
 	unsigned int container_options, ao2_sort_fn *sort_fn, ao2_callback_fn *cmp_fn);
 struct ao2_container *__ao2_container_alloc_list_debug(unsigned int ao2_options,
 	unsigned int container_options, ao2_sort_fn *sort_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 red-black tree container.
- *
- * \param ao2_options Container ao2 object options (See enum ao2_alloc_opts)
- * \param container_options Container behaviour options (See enum ao2_container_opts)
- * \param sort_fn Pointer to a sort function.
- * \param cmp_fn Pointer to a compare function used by ao2_find. (NULL to match everything)
- * \param tag used for debugging.
- *
- * \return A pointer to a struct container.
- *
- * \note Destructor is set implicitly.
- */
-
-#if defined(REF_DEBUG)
-
-#define ao2_t_container_alloc_tree(ao2_options, container_options, sort_fn, cmp_fn, tag) \
-	__ao2_container_alloc_tree_debug((ao2_options), (container_options), (sort_fn), (cmp_fn), (tag),  __FILE__, __LINE__, __PRETTY_FUNCTION__, 1)
-#define ao2_container_alloc_tree(ao2_options, container_options, , sort_fn, cmp_fn) \
-	__ao2_container_alloc_tree_debug((ao2_options), (container_options), (sort_fn), (cmp_fn), "",  __FILE__, __LINE__, __PRETTY_FUNCTION__, 1)
-
-#elif defined(__AST_DEBUG_MALLOC)
-
-#define ao2_t_container_alloc_tree(ao2_options, container_options, sort_fn, cmp_fn, tag) \
-	__ao2_container_alloc_tree_debug((ao2_options), (container_options), (sort_fn), (cmp_fn), (tag),  __FILE__, __LINE__, __PRETTY_FUNCTION__, 0)
-#define ao2_container_alloc_tree(ao2_options, container_options, sort_fn, cmp_fn) \
-	__ao2_container_alloc_tree_debug((ao2_options), (container_options), (sort_fn), (cmp_fn), "",  __FILE__, __LINE__, __PRETTY_FUNCTION__, 0)
-
-#else
-
-#define ao2_t_container_alloc_tree(ao2_options, container_options, sort_fn, cmp_fn, tag) \
-	__ao2_container_alloc_tree((ao2_options), (container_options), (sort_fn), (cmp_fn))
-#define ao2_container_alloc_tree(ao2_options, container_options, sort_fn, cmp_fn) \
-	__ao2_container_alloc_tree((ao2_options), (container_options), (sort_fn), (cmp_fn))
-
-#endif
-
-struct ao2_container *__ao2_container_alloc_tree(unsigned int ao2_options, unsigned int container_options,
-	ao2_sort_fn *sort_fn, ao2_callback_fn *cmp_fn);
-struct ao2_container *__ao2_container_alloc_tree_debug(unsigned int ao2_options, unsigned int container_options,
-	ao2_sort_fn *sort_fn, ao2_callback_fn *cmp_fn,
 	const char *tag, const char *file, int line, const char *func, int ref_debug);
 
 /*! \brief

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=371467&r1=371466&r2=371467
==============================================================================
--- team/rmudgett/ao2_enhancements/main/astobj2.c (original)
+++ team/rmudgett/ao2_enhancements/main/astobj2.c Fri Aug 17 13:22:06 2012
@@ -2029,11 +2029,9 @@
 
 	/* Determine traversal order. */
 	switch (flags & OBJ_ORDER_MASK) {
-	case OBJ_ORDER_POST:
 	case OBJ_ORDER_DESCENDING:
 		state->descending = 1;
 		break;
-	case OBJ_ORDER_PRE:
 	case OBJ_ORDER_ASCENDING:
 	default:
 		break;
@@ -2868,8 +2866,6 @@
 	return __ao2_container_alloc_hash_debug(ao2_options, container_options, 1, NULL,
 		sort_fn, cmp_fn, tag, file, line, func, ref_debug);
 }
-
-/*! BUGBUG need to add red-black tree container support */
 
 #ifdef AO2_DEBUG
 static int print_cb(void *obj, void *arg, int flag)