[asterisk-commits] russell: branch russell/iax_refcount r80359 - in /team/russell/iax_refcount: ...

[SVN commits to the Asterisk project]

Author: russell
Date: Wed Aug 22 14:42:30 2007
New Revision: 80359

URL: http://svn.digium.com/view/asterisk?view=rev&rev=80359
Log:
formatting and doxygen tweaks for static functions

Modified:
    team/russell/iax_refcount/include/asterisk/astobj2.h
    team/russell/iax_refcount/main/astobj2.c

Modified: team/russell/iax_refcount/include/asterisk/astobj2.h
URL: http://svn.digium.com/view/asterisk/team/russell/iax_refcount/include/asterisk/astobj2.h?view=diff&rev=80359&r1=80358&r2=80359
==============================================================================
--- team/russell/iax_refcount/include/asterisk/astobj2.h (original)
+++ team/russell/iax_refcount/include/asterisk/astobj2.h Wed Aug 22 14:42:30 2007
@@ -268,16 +268,16 @@
  */
 enum search_flags {
 	/*! unlink the object found */
-	OBJ_UNLINK	= (1 << 0),
+	OBJ_UNLINK	 = (1 << 0),
 	/*! on match, don't return the object or increase its reference count. */
-	OBJ_NODATA	= (1 << 1),
+	OBJ_NODATA	 = (1 << 1),
 	/*! don't stop at the first match 
 	 *  \note This is not fully implemented. */
-	OBJ_MULTIPLE	= (1 << 2),
+	OBJ_MULTIPLE = (1 << 2),
 	/*! obj is an object of the same type as the one being searched for.
 	 *  This implies that it can be passed to the object's hash function
 	 *  for optimized searching. */
-	OBJ_POINTER	= (1 << 3),
+	OBJ_POINTER	 = (1 << 3),
 };
 
 /*!

Modified: team/russell/iax_refcount/main/astobj2.c
URL: http://svn.digium.com/view/asterisk/team/russell/iax_refcount/main/astobj2.c?view=diff&rev=80359&r1=80358&r2=80359
==============================================================================
--- team/russell/iax_refcount/main/astobj2.c (original)
+++ team/russell/iax_refcount/main/astobj2.c Wed Aug 22 14:42:30 2007
@@ -346,29 +346,31 @@
 	return p;
 }
 
-/*
- * another convenience function is a callback that matches on address
+/*!
+ * \brief another convenience function is a callback that matches on address
  */
 static int match_by_addr(void *user_data, void *arg, int flags)
 {
 	return (user_data == arg) ? (CMP_MATCH | CMP_STOP) : 0;
 }
 
+/*
+ * Unlink an object from the container
+ * and destroy the associated * ao2_bucket_list structure.
+ */
+void *ao2_unlink(ao2_container *c, void *user_data)
+{
+	if (INTERNAL_OBJ(user_data) == NULL)	/* safety check on the argument */
+		return NULL;
+
+	ao2_callback(c, OBJ_UNLINK | OBJ_POINTER | OBJ_NODATA, match_by_addr, user_data);
+
+	return NULL;
+}
+
 /*! 
- * \brief Unlink an object from the container
- * and destroy the associated * ao2_bucket_list structure.
- */
-void *ao2_unlink(ao2_container *c, void *user_data)
-{
-	if (INTERNAL_OBJ(user_data) == NULL)	/* safety check on the argument */
-		return NULL;
-
-	ao2_callback(c, OBJ_UNLINK | OBJ_POINTER | OBJ_NODATA, match_by_addr, user_data);
-
-	return NULL;
-}
-
-/* special callback that matches all */
+ * \brief special callback that matches all 
+ */ 
 static int cb_true(void *user_data, void *arg, int flags)
 {
 	return CMP_MATCH;