[asterisk-commits] mjordan: trunk r404532 - in /trunk: ./ res/res_pjsip/pjsip_cli.c

[SVN commits to the Asterisk project]

Author: mjordan
Date: Fri Dec 20 21:35:04 2013
New Revision: 404532

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=404532
Log:
res_pjsip/pjsip_cli: fix compilation error caused by passing ast_free

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

Modified:
    trunk/   (props changed)
    trunk/res/res_pjsip/pjsip_cli.c

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-12-merged (original)
+++ branch-12-merged Fri Dec 20 21:35:04 2013
@@ -1,1 +1,1 @@
-/branches/12:1-398558,398560-398577,398579-399305,399307-401390,401392-403290,403292-403778,403781-404509
+/branches/12:1-398558,398560-398577,398579-399305,399307-401390,401392-403290,403292-403778,403781-404509,404531

Modified: trunk/res/res_pjsip/pjsip_cli.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_pjsip/pjsip_cli.c?view=diff&rev=404532&r1=404531&r2=404532
==============================================================================
--- trunk/res/res_pjsip/pjsip_cli.c (original)
+++ trunk/res/res_pjsip/pjsip_cli.c Fri Dec 20 21:35:04 2013
@@ -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 @@
 
 	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 @@
 {
 	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);
+	}
+}