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

Merged revisions 377245-377246 via svnmerge from

Browse Source 
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
This commit is contained in:
Automerge script
2012-12-05 03:19:08 +00:00
parent 02e9f9fdd7
commit 521f9e8dfe
3 changed files with 3 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/asterisk/_private.h
View File

@@ -20,7 +20,6 @@ int load_pbx(void); /*!< Provided by pbx.c */
int init_logger(void); /*!< Provided by logger.c */ int init_logger(void); /*!< Provided by logger.c */
void close_logger(void); /*!< Provided by logger.c */ void close_logger(void); /*!< Provided by logger.c */
void clean_time_zones(void); /*!< Provided by localtime.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 ast_term_init(void); /*!< Provided by term.c */
int astdb_init(void); /*!< Provided by db.c */ int astdb_init(void); /*!< Provided by db.c */
void ast_channels_init(void); /*!< Provided by channel.c */ void ast_channels_init(void); /*!< Provided by channel.c */

5
main/asterisk.c
View File

@@ -4251,11 +4251,6 @@ int main(int argc, char *argv[])
exit(1); exit(1);
} }
if (init_framer()) {
printf("%s", term_quit());
exit(1);
}
if (ast_enum_init()) { if (ast_enum_init()) {
printf("%s", term_quit()); printf("%s", term_quit());
exit(1); exit(1);

10
main/format.c
View File

@@ -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_codecs, "Displays a list of codecs"),
AST_CLI_DEFINE(show_codec_n, "Shows a specific codec"), 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) 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 */ /*! \internal \brief Clean up resources on Asterisk shutdown */
static void format_attr_shutdown(void) static void format_attr_shutdown(void)
{ {
ast_cli_unregister_multiple(my_clis, ARRAY_LEN(my_clis));
if (interfaces) { if (interfaces) {
ao2_ref(interfaces, -1); ao2_ref(interfaces, -1);
interfaces = NULL; interfaces = NULL;
@@ -1121,13 +1117,13 @@ static void format_attr_shutdown(void)
int ast_format_attr_init(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, interfaces = ao2_container_alloc_options(AO2_ALLOC_OPT_LOCK_RWLOCK,
283, interface_hash_cb, interface_cmp_cb); 283, interface_hash_cb, interface_cmp_cb);
if (!interfaces) { if (!interfaces) {
return -1; return -1;
} }
ast_cli_register_multiple(my_clis, ARRAY_LEN(my_clis));
ast_register_atexit(format_attr_shutdown); ast_register_atexit(format_attr_shutdown);
return 0; return 0;
} }