sysmocom
/
asterisk
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "codec_speex.c: Cleanup module loading to DECLINE and not FAILURE." into 16

This commit is contained in:
George Joseph 2018-10-05 14:31:17 -05:00 committed by Gerrit Code Review
parent 0e38d72b35 bc335ceda8
commit 04fcfe856a
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
codecs/codec_speex.c
View File

@ -689,39 +689,37 @@ static int reload(void)
static int unload_module(void)
{
int res = 0;
ast_unregister_translator(&speextolin);
ast_unregister_translator(&lintospeex);
ast_unregister_translator(&speexwbtolin16);
ast_unregister_translator(&lin16tospeexwb);
ast_unregister_translator(&speexuwbtolin32);
ast_unregister_translator(&lin32tospeexuwb);
res |= ast_unregister_translator(&speextolin);
res |= ast_unregister_translator(&lintospeex);
res |= ast_unregister_translator(&speexwbtolin16);
res |= ast_unregister_translator(&lin16tospeexwb);
res |= ast_unregister_translator(&speexuwbtolin32);
res |= ast_unregister_translator(&lin32tospeexuwb);
return res;
return 0;
}
static int load_module(void)
{
int res = 0;
if (parse_config(0))
if (parse_config(0)) {
return AST_MODULE_LOAD_DECLINE;
}
/* XXX It is most likely a bug in this module if we fail to register a translator */
res |= ast_register_translator(&speextolin);
res |= ast_register_translator(&lintospeex);
res |= ast_register_translator(&speexwbtolin16);
res |= ast_register_translator(&lin16tospeexwb);
res |= ast_register_translator(&speexuwbtolin32);
res |= ast_register_translator(&lin32tospeexuwb);
if (res) {
unload_module();
return res;
return AST_MODULE_LOAD_DECLINE;
}
return res;
return AST_MODULE_LOAD_SUCCESS;
}
AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Speex Coder/Decoder",