diff options
| author | Richard Mudgett <rmudgett@digium.com> | 2012-12-05 02:20:57 +0000 |
|---|---|---|
| committer | Richard Mudgett <rmudgett@digium.com> | 2012-12-05 02:20:57 +0000 |
| commit | 4dcb973228317f76773703613921a00cda200dae (patch) | |
| tree | 383e1b556f48eb1e4bdb714b08653e09eb865457 /main/format.c | |
| parent | ddad7cf4bd2d8d1ad4d244d07eb1e4f256a7205d (diff) | |
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
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@377245 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/format.c')
| -rw-r--r-- | main/format.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/main/format.c b/main/format.c index 139dfd331..cea89a2b6 100644 --- a/main/format.c +++ b/main/format.c @@ -911,7 +911,6 @@ static struct ast_cli_entry my_clis[] = { }; int init_framer(void) { - ast_cli_register_multiple(my_clis, ARRAY_LEN(my_clis)); return 0; } @@ -1113,6 +1112,7 @@ init_list_cleanup: /*! \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 @@ static void format_attr_shutdown(void) 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; } |