diff options
Diffstat (limited to 'codecs')
-rw-r--r-- | codecs/codec_adpcm.c | 4 | ||||
-rw-r--r-- | codecs/codec_alaw.c | 4 | ||||
-rw-r--r-- | codecs/codec_dahdi.c | 4 | ||||
-rw-r--r-- | codecs/codec_g722.c | 4 | ||||
-rw-r--r-- | codecs/codec_g726.c | 4 | ||||
-rw-r--r-- | codecs/codec_gsm.c | 4 | ||||
-rw-r--r-- | codecs/codec_lpc10.c | 4 | ||||
-rw-r--r-- | codecs/codec_speex.c | 4 | ||||
-rw-r--r-- | codecs/codec_ulaw.c | 4 |
9 files changed, 9 insertions, 27 deletions
diff --git a/codecs/codec_adpcm.c b/codecs/codec_adpcm.c index 5cdf54176..20901151b 100644 --- a/codecs/codec_adpcm.c +++ b/codecs/codec_adpcm.c @@ -345,9 +345,7 @@ 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) - return 0; - if (cfg == CONFIG_STATUS_FILEUNCHANGED) + if (cfg == CONFIG_STATUS_FILEMISSING || cfg == CONFIG_STATUS_FILEUNCHANGED || cfg == CONFIG_STATUS_FILEINVALID) return 0; for (var = ast_variable_browse(cfg, "plc"); var ; var = var->next) { if (!strcasecmp(var->name, "genericplc")) { diff --git a/codecs/codec_alaw.c b/codecs/codec_alaw.c index a261dedb7..04d4048b8 100644 --- a/codecs/codec_alaw.c +++ b/codecs/codec_alaw.c @@ -128,9 +128,7 @@ 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) - return 0; - if (cfg == CONFIG_STATUS_FILEUNCHANGED) + if (cfg == CONFIG_STATUS_FILEMISSING || cfg == CONFIG_STATUS_FILEUNCHANGED || cfg == CONFIG_STATUS_FILEINVALID) return 0; for (var = ast_variable_browse(cfg, "plc"); var; var = var->next) { if (!strcasecmp(var->name, "genericplc")) { diff --git a/codecs/codec_dahdi.c b/codecs/codec_dahdi.c index 4c6ee3269..47fabc7c0 100644 --- a/codecs/codec_dahdi.c +++ b/codecs/codec_dahdi.c @@ -351,9 +351,7 @@ 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); - if (cfg == NULL) - return 0; - if (cfg == CONFIG_STATUS_FILEUNCHANGED) + if (cfg == CONFIG_STATUS_FILEMISSING || cfg == CONFIG_STATUS_FILEUNCHANGED || cfg == CONFIG_STATUS_FILEINVALID) return 0; for (var = ast_variable_browse(cfg, "plc"); var; var = var->next) { diff --git a/codecs/codec_g722.c b/codecs/codec_g722.c index b221ab20f..41e17807f 100644 --- a/codecs/codec_g722.c +++ b/codecs/codec_g722.c @@ -244,9 +244,7 @@ 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); - if (cfg == NULL) - return 0; - if (cfg == CONFIG_STATUS_FILEUNCHANGED) + if (cfg == CONFIG_STATUS_FILEMISSING || cfg == CONFIG_STATUS_FILEUNCHANGED || cfg == CONFIG_STATUS_FILEINVALID) return 0; for (var = ast_variable_browse(cfg, "plc"); var; var = var->next) { if (!strcasecmp(var->name, "genericplc")) { diff --git a/codecs/codec_g726.c b/codecs/codec_g726.c index 80e0e8ea9..38d461a1c 100644 --- a/codecs/codec_g726.c +++ b/codecs/codec_g726.c @@ -890,9 +890,7 @@ 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); - if (cfg == NULL) - return 0; - if (cfg == CONFIG_STATUS_FILEUNCHANGED) + if (cfg == CONFIG_STATUS_FILEMISSING || cfg == CONFIG_STATUS_FILEUNCHANGED || cfg == CONFIG_STATUS_FILEINVALID) return 0; for (var = ast_variable_browse(cfg, "plc"); var; var = var->next) { if (!strcasecmp(var->name, "genericplc")) { diff --git a/codecs/codec_gsm.c b/codecs/codec_gsm.c index defc1d898..1664632a4 100644 --- a/codecs/codec_gsm.c +++ b/codecs/codec_gsm.c @@ -229,9 +229,7 @@ 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) - return 0; - if (cfg == CONFIG_STATUS_FILEUNCHANGED) + if (cfg == CONFIG_STATUS_FILEMISSING || cfg == CONFIG_STATUS_FILEUNCHANGED || cfg == CONFIG_STATUS_FILEINVALID) return 0; for (var = ast_variable_browse(cfg, "plc"); var; var = var->next) { if (!strcasecmp(var->name, "genericplc")) { diff --git a/codecs/codec_lpc10.c b/codecs/codec_lpc10.c index abea9d204..9237f70fe 100644 --- a/codecs/codec_lpc10.c +++ b/codecs/codec_lpc10.c @@ -255,9 +255,7 @@ 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) - return 0; - if (cfg == CONFIG_STATUS_FILEUNCHANGED) + if (cfg == CONFIG_STATUS_FILEMISSING || cfg == CONFIG_STATUS_FILEUNCHANGED || cfg == CONFIG_STATUS_FILEINVALID) return 0; for (var = ast_variable_browse(cfg, "plc"); var; var = var->next) { if (!strcasecmp(var->name, "genericplc")) { diff --git a/codecs/codec_speex.c b/codecs/codec_speex.c index 734491c75..961aaa649 100644 --- a/codecs/codec_speex.c +++ b/codecs/codec_speex.c @@ -375,9 +375,7 @@ static int parse_config(int reload) int res; float res_f; - if (cfg == NULL) - return 0; - if (cfg == CONFIG_STATUS_FILEUNCHANGED) + if (cfg == CONFIG_STATUS_FILEMISSING || cfg == CONFIG_STATUS_FILEUNCHANGED || cfg == CONFIG_STATUS_FILEINVALID) return 0; for (var = ast_variable_browse(cfg, "speex"); var; var = var->next) { diff --git a/codecs/codec_ulaw.c b/codecs/codec_ulaw.c index d58abe926..799b96357 100644 --- a/codecs/codec_ulaw.c +++ b/codecs/codec_ulaw.c @@ -141,9 +141,7 @@ 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) - return 0; - if (cfg == CONFIG_STATUS_FILEUNCHANGED) + if (cfg == CONFIG_STATUS_FILEMISSING || cfg == CONFIG_STATUS_FILEUNCHANGED || cfg == CONFIG_STATUS_FILEINVALID) return 0; for (var = ast_variable_browse(cfg, "plc"); var; var = var->next) { if (!strcasecmp(var->name, "genericplc")) { |