kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-04 11:58:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

res_pjsip/pjsip_cli: fix compilation error caused by passing ast_free

Browse Source 
When wanting to pass *free as a function pointer, ast_free_ptr has to be used
instead of ast_free. This allows it to be compiled with MALLOC_DEBUG enabled.
........

Merged revisions 404531 from http://svn.asterisk.org/svn/asterisk/branches/12


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@404532 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Matthew Jordan
2013-12-21 03:35:04 +00:00
parent 40a7f68e4b
commit 5a15803a1b
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
res/res_pjsip/pjsip_cli.c
View File

@@ -20,6 +20,7 @@
#include <pjsip.h>
#include <pjsip_ua.h>
#include "asterisk/res_pjsip.h"
#include "include/res_pjsip_private.h"
#include "asterisk/res_pjsip_cli.h"
@@ -303,7 +304,7 @@ int ast_sip_initialize_cli(struct ast_sorcery *sorcery)
if (ast_cli_register_multiple(cli_commands, ARRAY_LEN(cli_commands))) {
ast_log(LOG_ERROR, "Failed to register pjsip cli commands.\n");
ast_hashtab_destroy(formatter_registry, ast_free);
ast_hashtab_destroy(formatter_registry, ast_free_ptr);
return -1;
}
sip_sorcery = sorcery;
@@ -314,6 +315,6 @@ void ast_sip_destroy_cli(void)
{
ast_cli_unregister_multiple(cli_commands, ARRAY_LEN(cli_commands));
if (formatter_registry) {
ast_hashtab_destroy(formatter_registry, ast_free);
ast_hashtab_destroy(formatter_registry, ast_free_ptr);
}
}