kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 55555 via svnmerge from

Browse Source 
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: https://origsvn.digium.com/svn/asterisk/trunk@55556 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Jason Parker
2007-02-20 16:56:58 +00:00
parent 006817c0e7
commit ae47fc4541
3 changed files with 6 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
channels/chan_gtalk.c
View File

@@ -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, '@'))
@@ -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(&gtalklock);
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);

6
channels/chan_jingle.c
View File

@@ -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);