From: Jason Parker <jparker@digium.com>
Date: Fri, 21 Dec 2007 20:12:50 +0000 (+0000)
Subject: codecs.conf really shouldn't be mandatory..  it never had been before, so let's go... 
X-Git-Tag: 1.6.0-beta1~3^2~331
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4710e2b6dae789d8f71e83293c5c39184522fd85;p=thirdparty%2Fasterisk.git

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
---

diff --git a/codecs/codec_adpcm.c b/codecs/codec_adpcm.c
index 83e15c1902..63a1ab1bc5 100644
--- 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 f1a44d0628..ba5808f78e 100644
--- 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 8e77e4c749..a81b9b6a16 100644
--- 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 5a50d3b4d1..c8a671ee83 100644
--- 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 27175cfd9e..bb4af8cfb1 100644
--- 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 dfede082f5..1e4ec37f33 100644
--- 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 46d9868604..21c98a5f58 100644
--- 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 b91213ef50..ebd1928a2b 100644
--- 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 222b95a518..b5b99d29a2 100644
--- 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;