diff options
| -rw-r--r-- | channels/chan_gtalk.c | 13 | ||||
| -rw-r--r-- | channels/chan_jingle.c | 6 | ||||
| -rw-r--r-- | res/res_jabber.c | 4 |
3 files changed, 6 insertions, 17 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); 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); diff --git a/res/res_jabber.c b/res/res_jabber.c index 721398f91..b47add708 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')) { |