diff options
| author | Tilghman Lesher <tilghman@meg.abyt.es> | 2009-06-29 17:56:29 +0000 |
|---|---|---|
| committer | Tilghman Lesher <tilghman@meg.abyt.es> | 2009-06-29 17:56:29 +0000 |
| commit | b5f6eac49e7aabe9315f8c5149acc66b4825a1a4 (patch) | |
| tree | bf2e779e3f2763882b6893a7092138f4ea181f80 | |
| parent | f2a94ef51cbb2352004f454212555524ba57b157 (diff) | |
Allow trunk to once again compile under MALLOC_DEBUG
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@204118 65c4cc65-6c06-0410-ace0-fbb531ad65f3
| -rw-r--r-- | include/asterisk/channel.h | 5 | ||||
| -rw-r--r-- | main/channel.c | 8 |
2 files changed, 11 insertions, 2 deletions
diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h index 496e477a2..ddd5e9e80 100644 --- a/include/asterisk/channel.h +++ b/include/asterisk/channel.h @@ -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 * 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); +#endif /*! * \brief Queue one or more frames to a channel's frame queue diff --git a/main/channel.c b/main/channel.c index f33de43ea..a95e8f217 100644 --- a/main/channel.c +++ b/main/channel.c @@ -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 * 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) +#endif { struct ast_channel *tmp; struct varshead *headp; #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; } #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; } #else |