mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-05 04:11:08 +00:00
Make the MALLOC_DEBUG output for free() useful again. After changing calls to
free to be ast_free, astmm said all calls to free were coming from utils.h git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@82628 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -49,6 +49,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
|
||||
#ifdef AAL_ARGCHECK
|
||||
#include "asterisk/argdesc.h"
|
||||
#endif
|
||||
#include "asterisk/utils.h"
|
||||
|
||||
extern int localized_pbx_load_module(void);
|
||||
|
||||
@@ -3702,7 +3703,7 @@ void add_extensions(struct ael_extension *exten)
|
||||
pbx_substitute_variables_helper(NULL, exten->name, realext, sizeof(realext) - 1);
|
||||
if (exten->hints) {
|
||||
if (ast_add_extension2(exten->context, 0 /*no replace*/, realext, PRIORITY_HINT, NULL, exten->cidmatch,
|
||||
exten->hints, NULL, ast_free, registrar)) {
|
||||
exten->hints, NULL, ast_free_ptr, registrar)) {
|
||||
ast_log(LOG_WARNING, "Unable to add step at priority 'hint' of extension '%s'\n",
|
||||
exten->name);
|
||||
}
|
||||
@@ -3782,7 +3783,7 @@ void add_extensions(struct ael_extension *exten)
|
||||
label = 0;
|
||||
|
||||
if (ast_add_extension2(exten->context, 0 /*no replace*/, realext, pr->priority_num, (label?label:NULL), exten->cidmatch,
|
||||
app, strdup(appargs), ast_free, registrar)) {
|
||||
app, strdup(appargs), ast_free_ptr, registrar)) {
|
||||
ast_log(LOG_WARNING, "Unable to add step at priority '%d' of extension '%s'\n", pr->priority_num,
|
||||
exten->name);
|
||||
}
|
||||
|
@@ -498,7 +498,7 @@ int ast_park_call(struct ast_channel *chan, struct ast_channel *peer, int timeou
|
||||
ast_clear_flag(peer, AST_FLAG_MASQ_NOSTREAM);
|
||||
}
|
||||
if (con) {
|
||||
if (!ast_add_extension2(con, 1, pu->parkingexten, 1, NULL, NULL, parkedcall, ast_strdup(pu->parkingexten), ast_free, registrar))
|
||||
if (!ast_add_extension2(con, 1, pu->parkingexten, 1, NULL, NULL, parkedcall, ast_strdup(pu->parkingexten), ast_free_ptr, registrar))
|
||||
notify_metermaids(pu->parkingexten, parking_con, AST_DEVICE_INUSE);
|
||||
}
|
||||
if (pu->notquiteyet) {
|
||||
@@ -2091,7 +2091,7 @@ static void *do_parking_thread(void *ignore)
|
||||
if (con) {
|
||||
char returnexten[AST_MAX_EXTENSION];
|
||||
snprintf(returnexten, sizeof(returnexten), "%s,,t", peername);
|
||||
ast_add_extension2(con, 1, peername, 1, NULL, NULL, "Dial", ast_strdup(returnexten), ast_free, registrar);
|
||||
ast_add_extension2(con, 1, peername, 1, NULL, NULL, "Dial", ast_strdup(returnexten), ast_free_ptr, registrar);
|
||||
}
|
||||
if (comebacktoorigin) {
|
||||
set_c_e_p(chan, parking_con_dial, peername, 1);
|
||||
|
Reference in New Issue
Block a user