kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-08 06:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow trunk to once again compile under MALLOC_DEBUG

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@204118 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2009-06-29 17:56:29 +00:00
parent f2a94ef51c
commit b5f6eac49e
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/asterisk/channel.h
View File

@@ -940,7 +940,12 @@ struct ast_channel * attribute_malloc __attribute__((format(printf, 13, 14)))
* that can then be populated with data for use in variable * that can then be populated with data for use in variable
* substitution when a real channel does not exist. * substitution when a real channel does not exist.
*/ */
#if defined(REF_DEBUG) || defined(__AST_DEBUG_MALLOC)
#define ast_dummy_channel_alloc() __ast_dummy_channel_alloc(__FILE__, __LINE__, __PRETTY_FUNCTION__)
struct ast_channel *__ast_dummy_channel_alloc(const char *file, int line, const char *function);
#else
struct ast_channel *ast_dummy_channel_alloc(void); struct ast_channel *ast_dummy_channel_alloc(void);
#endif
/*! /*!
* \brief Queue one or more frames to a channel's frame queue * \brief Queue one or more frames to a channel's frame queue

8
main/channel.c
View File

@@ -1021,17 +1021,21 @@ struct ast_channel *__ast_channel_alloc(int needqueue, int state, const char *ci
/* only do the minimum amount of work needed here to make a channel /* only do the minimum amount of work needed here to make a channel
* structure that can be used to expand channel vars */ * structure that can be used to expand channel vars */
#if defined(REF_DEBUG) || defined(__AST_DEBUG_MALLOC)
struct ast_channel *__ast_dummy_channel_alloc(const char *file, int line, const char *function)
#else
struct ast_channel *ast_dummy_channel_alloc(void) struct ast_channel *ast_dummy_channel_alloc(void)
#endif
{ {
struct ast_channel *tmp; struct ast_channel *tmp;
struct varshead *headp; struct varshead *headp;
#if defined(REF_DEBUG) #if defined(REF_DEBUG)
if (!(tmp = __ao2_alloc_debug(sizeof(*tmp), ast_dummy_channel_destructor, "", file, line, function, 1))) { if (!(tmp = __ao2_alloc_debug(sizeof(*tmp), ast_dummy_channel_destructor, "dummy channel", file, line, function, 1))) {
return NULL; return NULL;
} }
#elif defined(__AST_DEBUG_MALLOC) #elif defined(__AST_DEBUG_MALLOC)
if (!(tmp = __ao2_alloc_debug(sizeof(*tmp), ast_dummy_channel_destructor, "", file, line, function, 0))) { if (!(tmp = __ao2_alloc_debug(sizeof(*tmp), ast_dummy_channel_destructor, "dummy channel", file, line, function, 0))) {
return NULL; return NULL;
} }
#else #else