kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-21 09:10:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

allocate an int on the stack instead of with ast_calloc

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@32695 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2006-06-06 20:18:01 +00:00
parent 66e0ff5202
commit aee460f50b
1 changed files with 12 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
apps/app_followme.c
View File

@@ -476,10 +476,10 @@ static struct ast_channel *wait_for_winner(struct findme_user_listptr *findme_us
int ctstatus; int ctstatus;
int dg; int dg;
struct findme_user *tmpuser; struct findme_user *tmpuser;
int *to = ast_calloc(1, sizeof(*to)); int to = 0;
int livechannels = 0; int livechannels = 0;
int tmpto; int tmpto;
long totalwait = 0, wtd, towas = *to; long totalwait = 0, wtd, towas = 0;
char *callfromname; char *callfromname;
char *pressbuttonname; char *pressbuttonname;
@@ -494,14 +494,13 @@ static struct ast_channel *wait_for_winner(struct findme_user_listptr *findme_us
if (option_verbose > 2) if (option_verbose > 2)
ast_verbose(VERBOSE_PREFIX_3 "Original caller hungup. Cleanup.\n"); ast_verbose(VERBOSE_PREFIX_3 "Original caller hungup. Cleanup.\n");
clear_calling_tree(findme_user_list); clear_calling_tree(findme_user_list);
free(to);
return NULL; return NULL;
} }
ctstatus = 0; ctstatus = 0;
totalwait = nm->timeout * 1000; totalwait = nm->timeout * 1000;
wtd = 0; wtd = 0;
while (!ctstatus) { while (!ctstatus) {
*to = 1000; to = 1000;
pos = 1; pos = 1;
livechannels = 0; livechannels = 0;
watchers[0] = caller; watchers[0] = caller;
@@ -523,7 +522,6 @@ static struct ast_channel *wait_for_winner(struct findme_user_listptr *findme_us
ast_sched_runq(tmpuser->ochan->sched); ast_sched_runq(tmpuser->ochan->sched);
} else { } else {
ast_log(LOG_WARNING, "Unable to playback %s.\n", callfromname); ast_log(LOG_WARNING, "Unable to playback %s.\n", callfromname);
free(to);
return NULL; return NULL;
} }
} else { } else {
@@ -533,7 +531,6 @@ static struct ast_channel *wait_for_winner(struct findme_user_listptr *findme_us
ast_sched_runq(tmpuser->ochan->sched); ast_sched_runq(tmpuser->ochan->sched);
else { else {
ast_log(LOG_WARNING, "Unable to playback %s.\n", tpargs->norecordingprompt); ast_log(LOG_WARNING, "Unable to playback %s.\n", tpargs->norecordingprompt);
free(to);
return NULL; return NULL;
} }
} }
@@ -541,8 +538,8 @@ static struct ast_channel *wait_for_winner(struct findme_user_listptr *findme_us
if (tmpuser->ochan->stream) { if (tmpuser->ochan->stream) {
ast_sched_runq(tmpuser->ochan->sched); ast_sched_runq(tmpuser->ochan->sched);
tmpto = ast_sched_wait(tmpuser->ochan->sched); tmpto = ast_sched_wait(tmpuser->ochan->sched);
if (tmpto > 0 && tmpto < *to) if (tmpto > 0 && tmpto < to)
*to = tmpto; to = tmpto;
else if (tmpto < 0 && !tmpuser->ochan->timingfunc) { else if (tmpto < 0 && !tmpuser->ochan->timingfunc) {
ast_stopstream(tmpuser->ochan); ast_stopstream(tmpuser->ochan);
if (tmpuser->state == 1) { if (tmpuser->state == 1) {
@@ -558,7 +555,6 @@ static struct ast_channel *wait_for_winner(struct findme_user_listptr *findme_us
tmpuser->state = 3; tmpuser->state = 3;
else { else {
ast_log(LOG_WARNING, "Unable to playback %s.\n", pressbuttonname); ast_log(LOG_WARNING, "Unable to playback %s.\n", pressbuttonname);
free(to);
return NULL; return NULL;
} }
} }
@@ -571,7 +567,6 @@ static struct ast_channel *wait_for_winner(struct findme_user_listptr *findme_us
tmpuser->state = 3; tmpuser->state = 3;
} else { } else {
ast_log(LOG_WARNING, "Unable to playback %s.\n", pressbuttonname); free(to);
return NULL; return NULL;
} }
} else if (tmpuser->state == 3) { } else if (tmpuser->state == 3) {
@@ -586,21 +581,20 @@ static struct ast_channel *wait_for_winner(struct findme_user_listptr *findme_us
} }
} }
tmpto = *to; tmpto = to;
if (*to < 0) { if (to < 0) {
*to = 1000; to = 1000;
tmpto = 1000; tmpto = 1000;
} }
towas = *to; towas = to;
winner = ast_waitfor_n(watchers, pos, to); winner = ast_waitfor_n(watchers, pos, &to);
tmpto -= *to; tmpto -= to;
totalwait -= tmpto; totalwait -= tmpto;
wtd = *to; wtd = to;
if (totalwait <= 0) { if (totalwait <= 0) {
if (option_verbose > 2) if (option_verbose > 2)
ast_verbose(VERBOSE_PREFIX_3 "We've hit our timeout for this step. Drop everyone and move on to the next one. %ld\n", totalwait); ast_verbose(VERBOSE_PREFIX_3 "We've hit our timeout for this step. Drop everyone and move on to the next one. %ld\n", totalwait);
clear_calling_tree(findme_user_list); clear_calling_tree(findme_user_list);
free(to);
return NULL; return NULL;
} }
if (winner) { if (winner) {
@@ -640,7 +634,6 @@ static struct ast_channel *wait_for_winner(struct findme_user_listptr *findme_us
tmpuser->state = 1; tmpuser->state = 1;
} else { } else {
ast_log(LOG_WARNING, "Unable to playback %s.\n", callfromname); ast_log(LOG_WARNING, "Unable to playback %s.\n", callfromname);
free(to);
return NULL; return NULL;
} }
} else { } else {
@@ -649,7 +642,6 @@ static struct ast_channel *wait_for_winner(struct findme_user_listptr *findme_us
ast_sched_runq(tmpuser->ochan->sched); ast_sched_runq(tmpuser->ochan->sched);
else { else {
ast_log(LOG_WARNING, "Unable to playback %s.\n", tpargs->norecordingprompt); ast_log(LOG_WARNING, "Unable to playback %s.\n", tpargs->norecordingprompt);
free(to);
return NULL; return NULL;
} }
} }
@@ -717,14 +709,12 @@ static struct ast_channel *wait_for_winner(struct findme_user_listptr *findme_us
if (!strcmp(tmpuser->yn, tpargs->takecall)) { if (!strcmp(tmpuser->yn, tpargs->takecall)) {
if (option_debug) if (option_debug)
ast_log(LOG_DEBUG, "Match to take the call!\n"); ast_log(LOG_DEBUG, "Match to take the call!\n");
free(to);
return tmpuser->ochan; return tmpuser->ochan;
} }
if (!strcmp(tmpuser->yn, tpargs->nextindp)) { if (!strcmp(tmpuser->yn, tpargs->nextindp)) {
if (option_debug) if (option_debug)
ast_log(LOG_DEBUG, "Next in dial plan step requested.\n"); ast_log(LOG_DEBUG, "Next in dial plan step requested.\n");
*status = 1; *status = 1;
free(to);
return NULL; return NULL;
} }
@@ -738,7 +728,6 @@ static struct ast_channel *wait_for_winner(struct findme_user_listptr *findme_us
ast_log(LOG_DEBUG, "we didn't get a frame. hanging up. dg is %d\n",dg); ast_log(LOG_DEBUG, "we didn't get a frame. hanging up. dg is %d\n",dg);
if (!dg) { if (!dg) {
clear_calling_tree(findme_user_list); clear_calling_tree(findme_user_list);
free(to);
return NULL; return NULL;
} else { } else {
tmpuser->state = -1; tmpuser->state = -1;
@@ -749,7 +738,6 @@ static struct ast_channel *wait_for_winner(struct findme_user_listptr *findme_us
if (!livechannels) { if (!livechannels) {
if (option_verbose > 2) if (option_verbose > 2)
ast_verbose(VERBOSE_PREFIX_3 "no live channels left. exiting.\n"); ast_verbose(VERBOSE_PREFIX_3 "no live channels left. exiting.\n");
free(to);
return NULL; return NULL;
} }
} }
@@ -769,7 +757,6 @@ static struct ast_channel *wait_for_winner(struct findme_user_listptr *findme_us
} }
/* --- WAIT FOR WINNER NUMBER END! -----------*/ /* --- WAIT FOR WINNER NUMBER END! -----------*/
free(to);
return NULL; return NULL;
} }