Merged revisions 377245-377246 via svnmerge from

file:///srv/subversion/repos/asterisk/trunk

................
  r377245 | rmudgett | 2012-12-04 20:20:57 -0600 (Tue, 04 Dec 2012) | 8 lines

  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
................
  r377246 | rmudgett | 2012-12-04 20:23:10 -0600 (Tue, 04 Dec 2012) | 1 line

  Remove init_framer(). It no longer does anything.
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/team/mmichelson/threadpool@377251 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/include/asterisk/_private.h b/include/asterisk/_private.h
index a7ed68136f3212ae6b155f88c1c3df611dc1cc05..cded90ef7d60b9966fe470be76ff675de5a4ccae 100644 (file)
--- a/include/asterisk/_private.h
+++ b/include/asterisk/_private.h
@@ -20,7 +20,6 @@ int load_pbx(void);                   /*!< Provided by pbx.c */
 int init_logger(void);                 /*!< Provided by logger.c */
 void close_logger(void);               /*!< Provided by logger.c */
 void clean_time_zones(void);                   /*!< Provided by localtime.c */
-int init_framer(void);                 /*!< Provided by frame.c */
 int ast_term_init(void);               /*!< Provided by term.c */
 int astdb_init(void);                  /*!< Provided by db.c */
 void ast_channels_init(void);          /*!< Provided by channel.c */

diff --git a/main/asterisk.c b/main/asterisk.c
index aa12836c2a5971d98892aafad67b619b33972152..27145296ac1a3e0aedf792021c456a0e15039c74 100644 (file)
--- a/main/asterisk.c
+++ b/main/asterisk.c
@@ -4251,11 +4251,6 @@ int main(int argc, char *argv[])
                exit(1);
        }
 
-       if (init_framer()) {
-               printf("%s", term_quit());
-               exit(1);
-       }
-
        if (ast_enum_init()) {
                printf("%s", term_quit());
                exit(1);

diff --git a/main/format.c b/main/format.c
index 139dfd331009644c65c123583470326eaa0c32d1..36aa534c00fa617b25e1d515c93b5607b156bc5c 100644 (file)
--- a/main/format.c
+++ b/main/format.c
@@ -909,11 +909,6 @@ static struct ast_cli_entry my_clis[] = {
        AST_CLI_DEFINE(show_codecs, "Displays a list of codecs"),
        AST_CLI_DEFINE(show_codec_n, "Shows a specific codec"),
 };
-int init_framer(void)
-{
-       ast_cli_register_multiple(my_clis, ARRAY_LEN(my_clis));
-       return 0;
-}
 
 static int format_list_add_custom(struct ast_format_list *new)
 {
@@ -1113,6 +1108,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 +1117,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;
 }