codecs.conf really shouldn't be mandatory.. it never had been before, so let's go back to being optional.

A big "thank you" to pnlarsson on IRC for allowing me access to his system to debug this.

Closes issue #11584.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@94541 65c4cc65-6c06-0410-ace0-fbb531ad65f3
1.6.0
Jason Parker 18 years ago
parent 590a70a9cd
commit 4710e2b6da

@ -346,7 +346,7 @@ static int parse_config(int reload)
struct ast_config *cfg = ast_config_load("codecs.conf", config_flags);
struct ast_variable *var;
if (cfg == NULL)
return -1;
return 0;
if (cfg == CONFIG_STATUS_FILEUNCHANGED)
return 0;
for (var = ast_variable_browse(cfg, "plc"); var ; var = var->next) {

@ -129,7 +129,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 -1;
return 0;
if (cfg == CONFIG_STATUS_FILEUNCHANGED)
return 0;
for (var = ast_variable_browse(cfg, "plc"); var; var = var->next) {

@ -231,7 +231,7 @@ static int parse_config(int reload)
struct ast_config *cfg = ast_config_load("codecs.conf", config_flags);
if (cfg == NULL)
return -1;
return 0;
if (cfg == CONFIG_STATUS_FILEUNCHANGED)
return 0;
for (var = ast_variable_browse(cfg, "plc"); var; var = var->next) {

@ -891,7 +891,7 @@ static int parse_config(int reload)
struct ast_config *cfg = ast_config_load("codecs.conf", config_flags);
if (cfg == NULL)
return -1;
return 0;
if (cfg == CONFIG_STATUS_FILEUNCHANGED)
return 0;
for (var = ast_variable_browse(cfg, "plc"); var; var = var->next) {

@ -229,8 +229,8 @@ 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)
return -1;
if (cfg == NULL)
return 0;
if (cfg == CONFIG_STATUS_FILEUNCHANGED)
return 0;
for (var = ast_variable_browse(cfg, "plc"); var; var = var->next) {

@ -256,7 +256,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 -1;
return 0;
if (cfg == CONFIG_STATUS_FILEUNCHANGED)
return 0;
for (var = ast_variable_browse(cfg, "plc"); var; var = var->next) {

@ -373,8 +373,8 @@ static int parse_config(int reload)
int res;
float res_f;
if (cfg == NULL || cfg == CONFIG_STATUS_FILEUNCHANGED)
return -1;
if (cfg == NULL)
return 0;
if (cfg == CONFIG_STATUS_FILEUNCHANGED)
return 0;

@ -142,7 +142,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 -1;
return 0;
if (cfg == CONFIG_STATUS_FILEUNCHANGED)
return 0;
for (var = ast_variable_browse(cfg, "plc"); var; var = var->next) {

@ -377,8 +377,8 @@ 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)
return -1;
if (cfg == NULL)
return 0;
if (cfg == CONFIG_STATUS_FILEUNCHANGED)
return 0;

Loading…
Cancel
Save