Constify the result of a config retrieval function, to avoid mutilation (issue 7983).

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@43364 f38db490-d61c-443f-a65b-d21fe96a405b

4 files changed, 16 insertions, 16 deletions

diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index 1fa4c8784..65722a83d 100644
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -8796,8 +8796,8 @@ static int set_config(char *config_file, int reload)
 	int capability=iax2_capability;
 	struct ast_variable *v;
 	char *cat;
-	char *utype;
-	char *tosval;
+	const char *utype;
+	const char *tosval;
 	int format;
 	int portno = IAX_DEFAULT_PORTNO;
 	int  x;
@@ -9051,7 +9051,7 @@ static int set_config(char *config_file, int reload)
 		struct ast_variable *gen;
 		int genhasiax;
 		int genregisteriax;
-		char *hasiax, *registeriax;
+		const char *hasiax, *registeriax;
 		
 		genhasiax = ast_true(ast_variable_retrieve(ucfg, "general", "hasiax"));
 		genregisteriax = ast_true(ast_variable_retrieve(ucfg, "general", "registeriax"));
@@ -9080,9 +9080,9 @@ static int set_config(char *config_file, int reload)
 				}
 				if (ast_true(registeriax) || (!registeriax && genregisteriax)) {
 					char tmp[256];
-					char *host = ast_variable_retrieve(ucfg, cat, "host");
-					char *username = ast_variable_retrieve(ucfg, cat, "username");
-					char *secret = ast_variable_retrieve(ucfg, cat, "secret");
+					const char *host = ast_variable_retrieve(ucfg, cat, "host");
+					const char *username = ast_variable_retrieve(ucfg, cat, "username");
+					const char *secret = ast_variable_retrieve(ucfg, cat, "secret");
 					if (!host)
 						host = ast_variable_retrieve(ucfg, "general", "host");
 					if (!username)
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 24dc53f65..a21760d20 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -15975,7 +15975,7 @@ static int reload_config(enum channelreloadreason reason)
 	if (ucfg) {
 		struct ast_variable *gen;
 		int genhassip, genregistersip;
-		char *hassip, *registersip;
+		const char *hassip, *registersip;
 		
 		genhassip = ast_true(ast_variable_retrieve(ucfg, "general", "hassip"));
 		genregistersip = ast_true(ast_variable_retrieve(ucfg, "general", "registersip"));
@@ -15995,10 +15995,10 @@ static int reload_config(enum channelreloadreason reason)
 				}
 				if (ast_true(registersip) || (!registersip && genregistersip)) {
 					char tmp[256];
-					char *host = ast_variable_retrieve(ucfg, cat, "host");
-					char *username = ast_variable_retrieve(ucfg, cat, "username");
-					char *secret = ast_variable_retrieve(ucfg, cat, "secret");
-					char *contact = ast_variable_retrieve(ucfg, cat, "contact");
+					const char *host = ast_variable_retrieve(ucfg, cat, "host");
+					const char *username = ast_variable_retrieve(ucfg, cat, "username");
+					const char *secret = ast_variable_retrieve(ucfg, cat, "secret");
+					const char *contact = ast_variable_retrieve(ucfg, cat, "contact");
 					if (!host)
 						host = ast_variable_retrieve(ucfg, "general", "host");
 					if (!username)
diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index b2b43c583..eb82720ca 100644
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -10322,7 +10322,7 @@ static int unload_module(void)
 	return __unload_module();
 }
 
-static int build_channels(int iscrv, char *value, int reload, int lineno, int *found_pseudo)
+static int build_channels(int iscrv, const char *value, int reload, int lineno, int *found_pseudo)
 {
 	char *c, *chan;
 	int x, y, start, finish;
@@ -10337,7 +10337,7 @@ static int build_channels(int iscrv, char *value, int reload, int lineno, int *f
 		return -1;
 	}
 
-	c = value;
+	c = ast_strdupa(value);
 
 #ifdef HAVE_PRI
 	pri = NULL;
@@ -11162,7 +11162,7 @@ static int setup_zap(int reload)
 	cfg = ast_config_load("users.conf");
 	if (cfg) {
 		char *cat;
-		char *chans;
+		const char *chans;
 		process_zap(ast_variable_browse(cfg, "general"), 1, 1);
 		for (cat = ast_category_browse(cfg, NULL); cat ; cat = ast_category_browse(cfg, cat)) {
 			if (!strcasecmp(cat, "general"))
diff --git a/channels/iax2-provision.c b/channels/iax2-provision.c
index 229c64043..8febd5608 100644
--- a/channels/iax2-provision.c
+++ b/channels/iax2-provision.c
@@ -259,7 +259,7 @@ int iax_provision_version(unsigned int *version, const char *template, int force
 	return ret;
 }
 
-static int iax_template_parse(struct iax_template *cur, struct ast_config *cfg, char *s, char *def)
+static int iax_template_parse(struct iax_template *cur, struct ast_config *cfg, const char *s, const char *def)
 {
 	struct ast_variable *v;
 	int foundportno = 0;
@@ -269,7 +269,7 @@ static int iax_template_parse(struct iax_template *cur, struct ast_config *cfg,
 	struct hostent *hp;
 	struct ast_hostent h;
 	struct iax_template *src, tmp;
-	char *t;
+	const char *t;
 	if (def) {
 		t = ast_variable_retrieve(cfg, s ,"template");
 		src = NULL;