diff options
author | qwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-10-31 19:24:29 +0000 |
---|---|---|
committer | qwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-10-31 19:24:29 +0000 |
commit | 9e15a0e72bccc9f21dd009b1c8a6375f07420473 (patch) | |
tree | daa3437ec6e548a5cc02c05654c1b9993bfd0eef /codecs | |
parent | d15b80b30e54c603f892bbeaa090ed27708674db (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: http://svn.digium.com/svn/asterisk/trunk@87889 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'codecs')
-rw-r--r-- | codecs/codec_a_mu.c | 5 | ||||
-rw-r--r-- | codecs/codec_adpcm.c | 22 | ||||
-rw-r--r-- | codecs/codec_alaw.c | 22 | ||||
-rw-r--r-- | codecs/codec_g722.c | 24 | ||||
-rw-r--r-- | codecs/codec_g726.c | 24 | ||||
-rw-r--r-- | codecs/codec_gsm.c | 23 | ||||
-rw-r--r-- | codecs/codec_ilbc.c | 5 | ||||
-rw-r--r-- | codecs/codec_lpc10.c | 23 | ||||
-rw-r--r-- | codecs/codec_speex.c | 21 | ||||
-rw-r--r-- | codecs/codec_ulaw.c | 23 | ||||
-rw-r--r-- | codecs/codec_zap.c | 21 |
11 files changed, 132 insertions, 81 deletions
diff --git a/codecs/codec_a_mu.c b/codecs/codec_a_mu.c index b9c1c4938..40e14ca5e 100644 --- a/codecs/codec_a_mu.c +++ b/codecs/codec_a_mu.c @@ -161,8 +161,9 @@ static int load_module(void) res = ast_register_translator(&ulawtoalaw); else ast_unregister_translator(&alawtoulaw); - - return res; + if (res) + return AST_MODULE_LOAD_FAILURE; + return AST_MODULE_LOAD_SUCCESS; } AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "A-law and Mulaw direct Coder/Decoder"); diff --git a/codecs/codec_adpcm.c b/codecs/codec_adpcm.c index e76470b6c..a40bbbc9f 100644 --- a/codecs/codec_adpcm.c +++ b/codecs/codec_adpcm.c @@ -350,13 +350,15 @@ static struct ast_translator lintoadpcm = { .buf_size = BUFFER_SAMPLES/ 2, /* 2 samples per byte */ }; -static void parse_config(int reload) +static int parse_config(int reload) { struct ast_flags config_flags = { reload ? CONFIG_FLAG_FILEUNCHANGED : 0 }; struct ast_config *cfg = ast_config_load("codecs.conf", config_flags); struct ast_variable *var; - if (cfg == NULL || cfg == CONFIG_STATUS_FILEUNCHANGED) - return; + if (cfg == NULL) + 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")) { adpcmtolin.useplc = ast_true(var->value) ? 1 : 0; @@ -364,13 +366,15 @@ 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) @@ -387,14 +391,16 @@ static int load_module(void) { int res; - parse_config(0); + if (parse_config(0)) + return AST_MODULE_LOAD_DECLINE; res = ast_register_translator(&adpcmtolin); if (!res) res = ast_register_translator(&lintoadpcm); else ast_unregister_translator(&adpcmtolin); - - return res; + if (res) + return AST_MODULE_LOAD_FAILURE; + return AST_MODULE_LOAD_SUCCESS; } AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Adaptive Differential PCM Coder/Decoder", diff --git a/codecs/codec_alaw.c b/codecs/codec_alaw.c index 1c2805535..f4436d162 100644 --- a/codecs/codec_alaw.c +++ b/codecs/codec_alaw.c @@ -134,13 +134,15 @@ static struct ast_translator lintoalaw = { .buf_size = BUFFER_SAMPLES, }; -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 == NULL || cfg == CONFIG_STATUS_FILEUNCHANGED) - return; + if (cfg == NULL) + 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")) { alawtolin.useplc = ast_true(var->value) ? 1 : 0; @@ -148,14 +150,16 @@ static void parse_config(int reload) } } ast_config_destroy(cfg); + return 0; } /*! \brief standard module stuff */ 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) @@ -172,14 +176,16 @@ static int load_module(void) { int res; - parse_config(0); + if (parse_config(0)) + return AST_MODULE_LOAD_DECLINE; res = ast_register_translator(&alawtolin); if (!res) res = ast_register_translator(&lintoalaw); else ast_unregister_translator(&alawtolin); - - return res; + if (res) + return AST_MODULE_LOAD_FAILURE; + return AST_MODULE_LOAD_SUCCESS; } AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "A-law Coder/Decoder", diff --git a/codecs/codec_g722.c b/codecs/codec_g722.c index b2b760912..00e36fb33 100644 --- a/codecs/codec_g722.c +++ b/codecs/codec_g722.c @@ -164,14 +164,16 @@ static struct ast_translator lintog722 = { .buf_size = BUFFER_SAMPLES, }; -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 == NULL || cfg == CONFIG_STATUS_FILEUNCHANGED) - return; + if (cfg == NULL) + 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")) { g722tolin.useplc = ast_true(var->value) ? 1 : 0; @@ -180,13 +182,14 @@ static void parse_config(int reload) } } ast_config_destroy(cfg); + return 0; } 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) @@ -204,15 +207,18 @@ static int load_module(void) int res = 0; - parse_config(0); + if (parse_config(0)) + return AST_MODULE_LOAD_DECLINE; res |= ast_register_translator(&g722tolin); res |= ast_register_translator(&lintog722); - if (res) + if (res) { unload_module(); + return AST_MODULE_LOAD_FAILURE; + } - return res; + return AST_MODULE_LOAD_SUCCESS; } AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "ITU G.722-64kbps G722 Transcoder", diff --git a/codecs/codec_g726.c b/codecs/codec_g726.c index ba80588fa..183c4a9e4 100644 --- a/codecs/codec_g726.c +++ b/codecs/codec_g726.c @@ -894,14 +894,16 @@ static struct ast_translator g726aal2tog726 = { .buf_size = BUFFER_SAMPLES, }; -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 == NULL || cfg == CONFIG_STATUS_FILEUNCHANGED) - return; + if (cfg == NULL) + 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")) { g726tolin.useplc = ast_true(var->value) ? 1 : 0; @@ -910,13 +912,14 @@ static void parse_config(int reload) } } ast_config_destroy(cfg); + return 0; } 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) @@ -940,7 +943,8 @@ static int load_module(void) int res = 0; - parse_config(0); + if (parse_config(0)) + return AST_MODULE_LOAD_DECLINE; res |= ast_register_translator(&g726tolin); res |= ast_register_translator(&lintog726); @@ -951,10 +955,12 @@ static int load_module(void) res |= ast_register_translator(&g726aal2tog726); res |= ast_register_translator(&g726tog726aal2); - if (res) + if (res) { unload_module(); + return AST_MODULE_LOAD_FAILURE; + } - return res; + return AST_MODULE_LOAD_SUCCESS; } AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "ITU G.726-32kbps G726 Transcoder", 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", diff --git a/codecs/codec_ilbc.c b/codecs/codec_ilbc.c index 637f22d12..ea84eded3 100644 --- a/codecs/codec_ilbc.c +++ b/codecs/codec_ilbc.c @@ -237,8 +237,9 @@ static int load_module(void) res=ast_register_translator(&lintoilbc); else ast_unregister_translator(&ilbctolin); - - return res; + if (res) + return AST_MODULE_LOAD_FAILURE; + return AST_MODULE_LOAD_SUCCESS; } AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "iLBC Coder/Decoder"); diff --git a/codecs/codec_lpc10.c b/codecs/codec_lpc10.c index 3ed528bef..ca4964336 100644 --- a/codecs/codec_lpc10.c +++ b/codecs/codec_lpc10.c @@ -261,13 +261,15 @@ static struct ast_translator lintolpc10 = { .buf_size = LPC10_BYTES_IN_COMPRESSED_FRAME * (1 + BUFFER_SAMPLES / LPC10_SAMPLES_PER_FRAME), }; -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 == NULL || cfg == CONFIG_STATUS_FILEUNCHANGED) - return; + if (cfg == NULL) + 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")) { lpc10tolin.useplc = ast_true(var->value) ? 1 : 0; @@ -276,13 +278,14 @@ static void parse_config(int reload) } } ast_config_destroy(cfg); + return 0; } static int reload(void) { - parse_config(1); - - return 0; + if (parse_config(1)) + return AST_MODULE_LOAD_DECLINE; + return AST_MODULE_LOAD_SUCCESS; } @@ -300,14 +303,16 @@ static int load_module(void) { int res; - parse_config(0); + if (parse_config(0)) + return AST_MODULE_LOAD_DECLINE; res = ast_register_translator(&lpc10tolin); if (!res) res = ast_register_translator(&lintolpc10); else ast_unregister_translator(&lpc10tolin); - - return res; + if (res) + return AST_MODULE_LOAD_FAILURE; + return AST_MODULE_LOAD_SUCCESS; } AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "LPC10 2.4kbps Coder/Decoder", diff --git a/codecs/codec_speex.c b/codecs/codec_speex.c index c4e24f915..bbb6be238 100644 --- a/codecs/codec_speex.c +++ b/codecs/codec_speex.c @@ -375,7 +375,7 @@ static struct ast_translator lintospeex = { .buf_size = BUFFER_SAMPLES * 2, /* XXX maybe a lot less ? */ }; -static void parse_config(int reload) +static int parse_config(int reload) { struct ast_flags config_flags = { reload ? CONFIG_FLAG_FILEUNCHANGED : 0 }; struct ast_config *cfg = ast_config_load("codecs.conf", config_flags); @@ -384,7 +384,9 @@ static void parse_config(int reload) float res_f; if (cfg == NULL || cfg == CONFIG_STATUS_FILEUNCHANGED) - return; + return -1; + if (cfg == CONFIG_STATUS_FILEUNCHANGED) + return 0; for (var = ast_variable_browse(cfg, "speex"); var; var = var->next) { if (!strcasecmp(var->name, "quality")) { @@ -467,13 +469,14 @@ static void parse_config(int reload) } } ast_config_destroy(cfg); + return 0; } 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) @@ -490,14 +493,16 @@ static int load_module(void) { int res; - parse_config(0); + if (parse_config(0)) + return AST_MODULE_LOAD_DECLINE; res=ast_register_translator(&speextolin); if (!res) res=ast_register_translator(&lintospeex); else ast_unregister_translator(&speextolin); - - return res; + if (res) + return AST_MODULE_LOAD_FAILURE; + return AST_MODULE_LOAD_SUCCESS; } AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Speex Coder/Decoder", diff --git a/codecs/codec_ulaw.c b/codecs/codec_ulaw.c index 4ffbe835f..b10054f3e 100644 --- a/codecs/codec_ulaw.c +++ b/codecs/codec_ulaw.c @@ -147,13 +147,15 @@ static struct ast_translator lintoulaw = { .buffer_samples = BUFFER_SAMPLES, }; -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 == NULL || cfg == CONFIG_STATUS_FILEUNCHANGED) - return; + if (cfg == NULL) + 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")) { ulawtolin.useplc = ast_true(var->value) ? 1 : 0; @@ -161,13 +163,14 @@ static void parse_config(int reload) } } ast_config_destroy(cfg); + return 0; } 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) @@ -184,14 +187,16 @@ static int load_module(void) { int res; - parse_config(0); + if (parse_config(0)) + return AST_MODULE_LOAD_DECLINE; res = ast_register_translator(&ulawtolin); if (!res) res = ast_register_translator(&lintoulaw); else ast_unregister_translator(&ulawtolin); - - return res; + if (res) + return AST_MODULE_LOAD_FAILURE; + return AST_MODULE_LOAD_SUCCESS; } AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "mu-Law Coder/Decoder", diff --git a/codecs/codec_zap.c b/codecs/codec_zap.c index df400a9f9..5802ff2a1 100644 --- a/codecs/codec_zap.c +++ b/codecs/codec_zap.c @@ -380,14 +380,16 @@ static void unregister_translators(void) AST_LIST_UNLOCK(&translators); } -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")) { @@ -396,8 +398,8 @@ static void parse_config(int reload) global_useplc ? "" : "not "); } } - ast_config_destroy(cfg); + return 0; } static void build_translators(struct format_map *map, unsigned int dstfmts, unsigned int srcfmts) @@ -456,14 +458,15 @@ static int reload(void) { struct translator *cur; - parse_config(1); + if (parse_config(1)) + return AST_MODULE_LOAD_DECLINE; AST_LIST_LOCK(&translators); AST_LIST_TRAVERSE(&translators, cur, entry) cur->t.useplc = global_useplc; AST_LIST_UNLOCK(&translators); - return 0; + return AST_MODULE_LOAD_SUCCESS; } static int unload_module(void) @@ -476,11 +479,11 @@ static int unload_module(void) static int load_module(void) { - parse_config(0); + if (parse_config(0)) + return AST_MODULE_LOAD_DECLINE; find_transcoders(); ast_cli_register_multiple(cli, sizeof(cli) / sizeof(cli[0])); - - return 0; + return AST_MODULE_LOAD_SUCCESS; } AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Generic Zaptel Transcoder Codec Translator", |