diff options
| author | Jason Parker <jparker@digium.com> | 2007-10-31 19:24:29 +0000 |
|---|---|---|
| committer | Jason Parker <jparker@digium.com> | 2007-10-31 19:24:29 +0000 |
| commit | 59c9ff7ef2c001e68d1a75af3e9f6b4c24a6196e (patch) | |
| tree | daa3437ec6e548a5cc02c05654c1b9993bfd0eef /codecs/codec_gsm.c | |
| parent | 25c6d388f5e658e5fa52966a82a37d78a2441886 (diff) | |
More changes to change return values from load_module functions.
(issue #11096)
Patches:
codec_adpcm.c.patch uploaded by moy (license 222)
codec_alaw.c.patch uploaded by moy (license 222)
codec_a_mu.c.patch uploaded by moy (license 222)
codec_g722.c.patch uploaded by moy (license 222)
codec_g726.c.diff uploaded by moy (license 222)
codec_gsm.c.patch uploaded by moy (license 222)
codec_ilbc.c.patch uploaded by moy (license 222)
codec_lpc10.c.patch uploaded by moy (license 222)
codec_speex.c.patch uploaded by moy (license 222)
codec_ulaw.c.patch uploaded by moy (license 222)
codec_zap.c.patch uploaded by moy (license 222)
format_g723.c.patch uploaded by moy (license 222)
format_g726.c.patch uploaded by moy (license 222)
format_g729.c.patch uploaded by moy (license 222)
format_gsm.c.patch uploaded by moy (license 222)
format_h263.c.patch uploaded by moy (license 222)
format_h264.c.patch uploaded by moy (license 222)
format_ilbc.c.patch uploaded by moy (license 222)
format_jpeg.c.patch uploaded by moy (license 222)
format_ogg_vorbis.c.patch uploaded by moy (license 222)
format_pcm.c.patch uploaded by moy (license 222)
format_sln.c.patch uploaded by moy (license 222)
format_vox.c.patch uploaded by moy (license 222)
format_wav.c.patch uploaded by moy (license 222)
format_wav_gsm.c.patch uploaded by moy (license 222)
res_adsi.c.patch uploaded by eliel (license 64)
res_ael_share.c.patch uploaded by eliel (license 64)
res_clioriginate.c.patch uploaded by eliel (license 64)
res_convert.c.patch uploaded by eliel (license 64)
res_indications.c.patch uploaded by eliel (license 64)
res_musiconhold.c.patch uploaded by eliel (license 64)
res_smdi.c.patch uploaded by eliel (license 64)
res_speech.c.patch uploaded by eliel (license 64)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@87889 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'codecs/codec_gsm.c')
| -rw-r--r-- | codecs/codec_gsm.c | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/codecs/codec_gsm.c b/codecs/codec_gsm.c index b19abfe88..3fbcf9c8e 100644 --- a/codecs/codec_gsm.c +++ b/codecs/codec_gsm.c @@ -235,13 +235,15 @@ static struct ast_translator lintogsm = { }; -static void parse_config(int reload) +static int parse_config(int reload) { struct ast_variable *var; struct ast_flags config_flags = { reload ? CONFIG_FLAG_FILEUNCHANGED : 0 }; struct ast_config *cfg = ast_config_load("codecs.conf", config_flags); - if (!cfg || cfg == CONFIG_STATUS_FILEUNCHANGED) - return; + if (!cfg) + return -1; + if (cfg == CONFIG_STATUS_FILEUNCHANGED) + return 0; for (var = ast_variable_browse(cfg, "plc"); var; var = var->next) { if (!strcasecmp(var->name, "genericplc")) { gsmtolin.useplc = ast_true(var->value) ? 1 : 0; @@ -249,13 +251,16 @@ static void parse_config(int reload) } } ast_config_destroy(cfg); + return 0; } /*! \brief standard module glue */ static int reload(void) { - parse_config(1); - return 0; + if (parse_config(1)) { + return AST_MODULE_LOAD_DECLINE; + } + return AST_MODULE_LOAD_SUCCESS; } static int unload_module(void) @@ -273,14 +278,16 @@ static int load_module(void) { int res; - parse_config(0); + if (parse_config(0)) + return AST_MODULE_LOAD_DECLINE; res = ast_register_translator(&gsmtolin); if (!res) res=ast_register_translator(&lintogsm); else ast_unregister_translator(&gsmtolin); - - return res; + if (res) + return AST_MODULE_LOAD_FAILURE; + return AST_MODULE_LOAD_SUCCESS; } AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "GSM Coder/Decoder", |