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

- remove an unused variable

Browse Source 
- use ast_calloc instead of malloc + memset
- return immediately on ast_calloc failure instead of indenting the whole func
- remove a duplicate ast_strdupa


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@36700 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2006-07-03 03:39:37 +00:00
parent a717eef7c1
commit 03a277c5cc
1 changed files with 16 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
apps/app_meetme.c
View File

@@ -2346,7 +2346,6 @@ struct sla_originate_helper {
static void *sla_originate(void *data) static void *sla_originate(void *data)
{ {
struct sla_originate_helper *in = data; struct sla_originate_helper *in = data;
int res;
int reason = 0; int reason = 0;
struct ast_channel *chan = NULL; struct ast_channel *chan = NULL;
@@ -2363,23 +2362,24 @@ static void *sla_originate(void *data)
static void do_invite(struct ast_channel *orig, struct ast_sla *sla, const char *tech, const char *dest, const char *app) static void do_invite(struct ast_channel *orig, struct ast_sla *sla, const char *tech, const char *dest, const char *app)
{ {
struct sla_originate_helper *slal = malloc(sizeof(struct sla_originate_helper)); struct sla_originate_helper *slal;
pthread_attr_t attr; pthread_attr_t attr;
pthread_t th; pthread_t th;
if (slal) {
memset(slal, 0, sizeof(struct sla_originate_helper)); if (!(slal = ast_calloc(1, sizeof(*slal))))
ast_copy_string(slal->tech, tech, sizeof(slal->tech)); return;
ast_copy_string(slal->data, dest, sizeof(slal->data));
ast_copy_string(slal->app, app, sizeof(slal->app)); ast_copy_string(slal->tech, tech, sizeof(slal->tech));
ast_copy_string(slal->appdata, sla->name, sizeof(slal->appdata)); ast_copy_string(slal->data, dest, sizeof(slal->data));
if (orig->cid.cid_num) ast_copy_string(slal->app, app, sizeof(slal->app));
ast_copy_string(slal->cid_num, orig->cid.cid_num, sizeof(slal->cid_num)); ast_copy_string(slal->appdata, sla->name, sizeof(slal->appdata));
if (orig->cid.cid_name) if (orig->cid.cid_num)
ast_copy_string(slal->cid_name, orig->cid.cid_name, sizeof(slal->cid_name)); ast_copy_string(slal->cid_num, orig->cid.cid_num, sizeof(slal->cid_num));
pthread_attr_init(&attr); if (orig->cid.cid_name)
pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED); ast_copy_string(slal->cid_name, orig->cid.cid_name, sizeof(slal->cid_name));
ast_pthread_create(&th, &attr, sla_originate, slal); pthread_attr_init(&attr);
} pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
ast_pthread_create(&th, &attr, sla_originate, slal);
} }
static void invite_stations(struct ast_channel *orig, struct ast_sla *sla) static void invite_stations(struct ast_channel *orig, struct ast_sla *sla)
@@ -2431,9 +2431,6 @@ static int sla_exec(struct ast_channel *chan, void *data, int trunk)
if (chan->_state != AST_STATE_UP) if (chan->_state != AST_STATE_UP)
ast_answer(chan); ast_answer(chan);
info = ast_strdupa(data);
if (args.options) if (args.options)
ast_app_parse_options(sla_opts, &confflags, NULL, args.options); ast_app_parse_options(sla_opts, &confflags, NULL, args.options);