[asterisk-commits] kpfleming: branch 1.6.1 r192359 - in /branches/1.6.1: ./ include/asterisk/ main/

[SVN commits to the Asterisk project]

Author: kpfleming
Date: Tue May  5 08:37:23 2009
New Revision: 192359

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=192359
Log:
Merged revisions 192357 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r192357 | kpfleming | 2009-05-05 15:18:21 +0200 (Tue, 05 May 2009) | 5 lines
  
  Correct some flaws in the memory accounting code for stringfields and ao2 objects
  
  Under some conditions, the memory allocation for stringfields and ao2 objects would not have supplied valid file/function names for MALLOC_DEBUG tracking, so this commit corrects that.
........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/include/asterisk/stringfields.h
    branches/1.6.1/main/astobj2.c
    branches/1.6.1/main/utils.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/include/asterisk/stringfields.h
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.1/include/asterisk/stringfields.h?view=diff&rev=192359&r1=192358&r2=192359
==============================================================================
--- branches/1.6.1/include/asterisk/stringfields.h (original)
+++ branches/1.6.1/include/asterisk/stringfields.h Tue May  5 08:37:23 2009
@@ -243,7 +243,7 @@
 
 /*! \brief free all memory - to be called before destroying the object */
 #define ast_string_field_free_memory(x)	\
-	__ast_string_field_init(&(x)->__field_mgr, &(x)->__field_mgr_pool, -1, NULL, 0, NULL)
+	__ast_string_field_init(&(x)->__field_mgr, &(x)->__field_mgr_pool, -1, __FILE__, __LINE__, __PRETTY_FUNCTION__)
 
 /*!
  * \internal

Modified: branches/1.6.1/main/astobj2.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.1/main/astobj2.c?view=diff&rev=192359&r1=192358&r2=192359
==============================================================================
--- branches/1.6.1/main/astobj2.c (original)
+++ branches/1.6.1/main/astobj2.c Tue May  5 08:37:23 2009
@@ -353,7 +353,7 @@
 
 void *_ao2_alloc(size_t data_size, ao2_destructor_fn destructor_fn)
 {
-	return __ao2_alloc(data_size, destructor_fn, NULL, 0, NULL);
+	return __ao2_alloc(data_size, destructor_fn, __FILE__, __LINE__, __FUNCTION__);
 }
 
 

Modified: branches/1.6.1/main/utils.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.1/main/utils.c?view=diff&rev=192359&r1=192358&r2=192359
==============================================================================
--- branches/1.6.1/main/utils.c (original)
+++ branches/1.6.1/main/utils.c Tue May  5 08:37:23 2009
@@ -1575,7 +1575,7 @@
 		if (add_string_pool(mgr, pool_head, new_size, mgr->owner_file, mgr->owner_line, mgr->owner_func))
 			return NULL;
 #else
-		if (add_string_pool(mgr, pool_head, new_size, NULL, 0, NULL))
+		if (add_string_pool(mgr, pool_head, new_size, __FILE__, __LINE__, __FUNCTION__))
 			return NULL;
 #endif
 	}