aboutsummaryrefslogtreecommitdiffstats
path: root/channels/chan_jingle.c
diff options
context:
space:
mode:
authorqwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b>2007-02-20 16:56:58 +0000
committerqwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b>2007-02-20 16:56:58 +0000
commit25af172037c2576eac8b84bc699fe1d4bb0bff51 (patch)
treed8ce6d1225cae1aecb478b803bc364dfff1cd095 /channels/chan_jingle.c
parentd0f092ba8488073fc7550e4c58de43e0f35f571d (diff)
Merged revisions 55555 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r55555 | qwell | 2007-02-20 10:53:45 -0600 (Tue, 20 Feb 2007) | 4 lines No need to cast nor free with strdupa (thanks file) 55555! ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@55556 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_jingle.c')
-rw-r--r--channels/chan_jingle.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/channels/chan_jingle.c b/channels/chan_jingle.c
index b41e49bb5..26980640b 100644
--- a/channels/chan_jingle.c
+++ b/channels/chan_jingle.c
@@ -1360,15 +1360,13 @@ static struct ast_channel *jingle_request(const char *type, int format, void *da
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 Jingle Dialstring: %s\n", (char*) data);
- if (s)
- free(s);
return NULL;
}
}
@@ -1376,8 +1374,6 @@ static struct ast_channel *jingle_request(const char *type, int format, void *da
client = find_jingle(to, sender);
if (!client) {
ast_log(LOG_WARNING, "Could not find recipient.\n");
- if (s)
- free(s);
return NULL;
}
p = jingle_alloc(client, to, NULL);