From e0b88aba121021a2fe726d232972761d6453e6ce Mon Sep 17 00:00:00 2001
From: Jason Parker <jparker@digium.com>
Date: Tue, 20 Feb 2007 16:53:45 +0000
Subject: [PATCH] No need to cast nor free with strdupa (thanks file)

55555!


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@55555 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
 channels/chan_gtalk.c | 13 +++----------
 res/res_jabber.c      |  4 ++--
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/channels/chan_gtalk.c b/channels/chan_gtalk.c
index 7a9ee40aa1..250be0ef45 100644
--- a/channels/chan_gtalk.c
+++ b/channels/chan_gtalk.c
@@ -258,10 +258,9 @@ static struct gtalk *find_gtalk(char *name, char *connection)
 	struct gtalk *gtalk = NULL;
 	char *domain = NULL , *s = NULL;
 	if(strchr(connection, '@')) {
-		s = ast_strdupa((char *) connection);
+		s = ast_strdupa(connection);
 		domain = strsep(&s, "@");
 		ast_verbose("OOOOH domain = %s\n", domain);
-		free(s);
 	}
 	gtalk = ASTOBJ_CONTAINER_FIND(&gtalk_list, name);
 	if (!gtalk && strchr(name, '@'))
@@ -874,13 +873,11 @@ static struct gtalk_pvt *gtalk_alloc(struct gtalk *client, const char *us, const
 	}
 
 	if(strchr(tmp->us, '/')) {
-		data = ast_strdupa((char *) tmp->us);
+		data = ast_strdupa(tmp->us);
 		exten = strsep(&data, "/");
 	} else
 		exten = tmp->us;
 	ast_copy_string(tmp->exten,  exten, sizeof(tmp->exten));
-	if(data)
-		free(data);
 	ast_mutex_init(&tmp->lock);
 	ast_mutex_lock(&gtalklock);
 	tmp->next = client->p;
@@ -1477,15 +1474,13 @@ static struct ast_channel *gtalk_request(const char *type, int format, void *dat
 	struct ast_channel *chan = NULL;
 
 	if (data) {
-		s = ast_strdupa((char *) data);
+		s = ast_strdupa(data);
 		if (s) {
 			sender = strsep(&s, "/");
 			if (sender && (sender[0] != '\0'))
 				to = strsep(&s, "/");
 			if (!to) {
 				ast_log(LOG_ERROR, "Bad arguments in Gtalk Dialstring: %s\n", (char*) data);
-				if (s)
-					free(s);
 				return NULL;
 			}
 		}
@@ -1493,8 +1488,6 @@ static struct ast_channel *gtalk_request(const char *type, int format, void *dat
 	client = find_gtalk(to, sender);
 	if (!client) {
 		ast_log(LOG_WARNING, "Could not find recipient.\n");
-		if (s)
-			free(s);
 		return NULL;
 	}
 	p = gtalk_alloc(client, strchr(sender, '@') ? sender : client->connection->jid->full, strchr(to, '@') ? to : client->user, NULL);
diff --git a/res/res_jabber.c b/res/res_jabber.c
index 54c52a33a0..414f5c5bca 100644
--- a/res/res_jabber.c
+++ b/res/res_jabber.c
@@ -344,7 +344,7 @@ static int aji_status_exec(struct ast_channel *chan, void *data)
 		ast_log(LOG_ERROR, "This application requires arguments.\n");
 		return 0;
 	}
-	s = ast_strdupa((char *) data);
+	s = ast_strdupa(data);
 	if (s) {
 		sender = strsep(&s, "|");
 		if (sender && (sender[0] != '\0')) {
@@ -404,7 +404,7 @@ static int aji_send_exec(struct ast_channel *chan, void *data)
 		ast_log(LOG_ERROR, "This application requires arguments.\n");
 		return 0;
 	}
-	s = ast_strdupa((char *) data);
+	s = ast_strdupa(data);
 	if (s) {
 		sender = strsep(&s, "|");
 		if (sender && (sender[0] != '\0')) {