[asterisk-commits] rmudgett: trunk r377245 - in /trunk: ./ main/format.c

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Tue Dec  4 20:20:57 2012
New Revision: 377245

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=377245
Log:
Fix registering core show codecs/codec CLI commands twice.
........

Merged revisions 377241 from http://svn.asterisk.org/svn/asterisk/branches/10
........

Merged revisions 377244 from http://svn.asterisk.org/svn/asterisk/branches/11

Modified:
    trunk/   (props changed)
    trunk/main/format.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-11-merged' - no diff available.

Modified: trunk/main/format.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/format.c?view=diff&rev=377245&r1=377244&r2=377245
==============================================================================
--- trunk/main/format.c (original)
+++ trunk/main/format.c Tue Dec  4 20:20:57 2012
@@ -911,7 +911,6 @@
 };
 int init_framer(void)
 {
-	ast_cli_register_multiple(my_clis, ARRAY_LEN(my_clis));
 	return 0;
 }
 
@@ -1113,6 +1112,7 @@
 /*! \internal \brief Clean up resources on Asterisk shutdown */
 static void format_attr_shutdown(void)
 {
+	ast_cli_unregister_multiple(my_clis, ARRAY_LEN(my_clis));
 	if (interfaces) {
 		ao2_ref(interfaces, -1);
 		interfaces = NULL;
@@ -1121,13 +1121,13 @@
 
 int ast_format_attr_init(void)
 {
-	ast_cli_register_multiple(my_clis, ARRAY_LEN(my_clis));
-
 	interfaces = ao2_container_alloc_options(AO2_ALLOC_OPT_LOCK_RWLOCK,
 		283, interface_hash_cb, interface_cmp_cb);
 	if (!interfaces) {
 		return -1;
 	}
+
+	ast_cli_register_multiple(my_clis, ARRAY_LEN(my_clis));
 	ast_register_atexit(format_attr_shutdown);
 	return 0;
 }