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

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

diff --git a/codecs/codec_adpcm.c b/codecs/codec_adpcm.c
index 83e15c1902d8d1ee67c40643eb57673c8ecb7d01..63a1ab1bc5e121133a1c9c39f455e121aff240a5 100644 (file)
--- a/codecs/codec_adpcm.c
+++ b/codecs/codec_adpcm.c
@@ -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) {

diff --git a/codecs/codec_alaw.c b/codecs/codec_alaw.c
index f1a44d0628177ef5be4217382eee9073bf4fed8d..ba5808f78e4a64b8c8f2a1bd131b11b3fb312f37 100644 (file)
--- a/codecs/codec_alaw.c
+++ b/codecs/codec_alaw.c
@@ -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) {

diff --git a/codecs/codec_g722.c b/codecs/codec_g722.c
index 8e77e4c7495032bf5d336dddcc576b3d70895a8c..a81b9b6a16779803f7dd749d75be2c955c9f6f10 100644 (file)
--- a/codecs/codec_g722.c
+++ b/codecs/codec_g722.c
@@ -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) {

diff --git a/codecs/codec_g726.c b/codecs/codec_g726.c
index 5a50d3b4d1e89cc04deaa26c7c3116b5982ccaa6..c8a671ee83285e53d8296ea4eda6398782809a5a 100644 (file)
--- a/codecs/codec_g726.c
+++ b/codecs/codec_g726.c
@@ -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) {

diff --git a/codecs/codec_gsm.c b/codecs/codec_gsm.c
index 27175cfd9e418c0dbea594fb27124011b4614dc8..bb4af8cfb1bc23b1077ac5bda2ea438bf0048aa8 100644 (file)
--- a/codecs/codec_gsm.c
+++ b/codecs/codec_gsm.c
@@ -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) {

diff --git a/codecs/codec_lpc10.c b/codecs/codec_lpc10.c
index dfede082f543fa9350cc0f4fe0226f9f032a4a2a..1e4ec37f334cfd9dc25e484a8c1cb438b8a0da93 100644 (file)
--- a/codecs/codec_lpc10.c
+++ b/codecs/codec_lpc10.c
@@ -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) {

diff --git a/codecs/codec_speex.c b/codecs/codec_speex.c
index 46d986860470f6a936645ed3afe11bfa80329e4d..21c98a5f58804f235f17128112275740d1c4f35f 100644 (file)
--- a/codecs/codec_speex.c
+++ b/codecs/codec_speex.c
@@ -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;
 

diff --git a/codecs/codec_ulaw.c b/codecs/codec_ulaw.c
index b91213ef507a50405305d097d32f5ec4a7248dc9..ebd1928a2beb9644b707012220ef8e15cbd7c976 100644 (file)
--- a/codecs/codec_ulaw.c
+++ b/codecs/codec_ulaw.c
@@ -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) {

diff --git a/codecs/codec_zap.c b/codecs/codec_zap.c
index 222b95a518790d8dcf4f71ba9edfecab21f308d7..b5b99d29a236fef5a0590edc0270a17517f44a88 100644 (file)
--- a/codecs/codec_zap.c
+++ b/codecs/codec_zap.c
@@ -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;