[svn-commits] russell: branch russell/events r121499 - in /team/russell/events: include/ast...

[SVN commits to the Digium repositories]

Author: russell
Date: Tue Jun 10 08:41:17 2008
New Revision: 121499

URL: http://svn.digium.com/view/asterisk?view=rev&rev=121499
Log:
remove ao2_realloc().  I don't remember why I added this and it isn't used anywhere

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

Modified: team/russell/events/include/asterisk/astobj2.h
URL: http://svn.digium.com/view/asterisk/team/russell/events/include/asterisk/astobj2.h?view=diff&rev=121499&r1=121498&r2=121499
==============================================================================
--- team/russell/events/include/asterisk/astobj2.h (original)
+++ team/russell/events/include/asterisk/astobj2.h Tue Jun 10 08:41:17 2008
@@ -397,8 +397,6 @@
  *   rather, we just call ao2_ref(o, -1);
  */
 
-void *ao2_realloc(void *data, size_t data_size);
-
 #ifdef REF_DEBUG
 
 
@@ -413,7 +411,6 @@
 #endif
 void *_ao2_alloc_debug(const size_t data_size, ao2_destructor_fn destructor_fn, char *tag, char *file, int line, const char *funcname);
 void *_ao2_alloc(const size_t data_size, ao2_destructor_fn destructor_fn);
-
 
 /*! \brief
  * Reference/unreference an object and return the old refcount.

Modified: team/russell/events/main/astobj2.c
URL: http://svn.digium.com/view/asterisk/team/russell/events/main/astobj2.c?view=diff&rev=121499&r1=121498&r2=121499
==============================================================================
--- team/russell/events/main/astobj2.c (original)
+++ team/russell/events/main/astobj2.c Tue Jun 10 08:41:17 2008
@@ -299,22 +299,6 @@
 #endif
 
 	/* return a pointer to the user data */
-	return EXTERNAL_OBJ(obj);
-}
-
-void *ao2_realloc(void *data, size_t data_size)
-{
-	struct astobj2 *obj;
-
-	if (data_size < sizeof(void *))
-		data_size = sizeof(void *);
-
-	if (!(obj = INTERNAL_OBJ(data)))
-		return NULL;
-
-	if (!(data = ast_realloc(data, sizeof(*obj) + data_size)))
-		return NULL;
-
 	return EXTERNAL_OBJ(obj);
 }