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

diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h
index 496e477a224372b727e2b32b0d54c20285fd6e3d..ddd5e9e80c959dcc2c7267210a12d33089046bec 100644 (file)
--- 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 f33de43eafc81dcb1a8d895fd3bcf9ffbe09e9e3..a95e8f21782f4709f8a05db2057b158872891d6c 100644 (file)
--- 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