diff options
author | qwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-02-20 16:56:58 +0000 |
---|---|---|
committer | qwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-02-20 16:56:58 +0000 |
commit | 25af172037c2576eac8b84bc699fe1d4bb0bff51 (patch) | |
tree | d8ce6d1225cae1aecb478b803bc364dfff1cd095 /channels/chan_gtalk.c | |
parent | d0f092ba8488073fc7550e4c58de43e0f35f571d (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_gtalk.c')
-rw-r--r-- | channels/chan_gtalk.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/channels/chan_gtalk.c b/channels/chan_gtalk.c index 23beb00e1..ad335d2f9 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(>alk_list, name); if (!gtalk && strchr(name, '@')) @@ -876,13 +875,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(>alklock); tmp->next = client->p; @@ -1480,15 +1477,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; } } @@ -1496,8 +1491,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); |