kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-06 04:30:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

convert a bunch of apps to use ast_goto_if_exists() (issue #5138)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6533 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2005-09-07 19:13:00 +00:00
parent 1bd1a35a9a
commit e0f02b46f1
17 changed files with 62 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
apps/app_queue.c
View File

@@ -1007,10 +1007,7 @@ static int valid_exit(struct queue_ent *qe, char digit)
}
/* We have an exact match */
if (ast_exists_extension(qe->chan, qe->context, qe->digits, 1, qe->chan->cid.cid_num)) {
ast_copy_string(qe->chan->context, qe->context, sizeof(qe->chan->context));
ast_copy_string(qe->chan->exten, qe->digits, sizeof(qe->chan->exten));
qe->chan->priority = 0;
if (ast_goto_if_exists(qe->chan, qe->context, qe->digits, 1)) {
return 1;
}
return 0;
@@ -2546,8 +2543,7 @@ static int pqm_exec(struct ast_channel *chan, void *data)
if (set_member_paused(queuename, interface, 1)) {
ast_log(LOG_WARNING, "Attempt to pause interface %s, not found\n", interface);
if (ast_exists_extension(chan, chan->context, chan->exten, chan->priority + 101, chan->cid.cid_num)) {
chan->priority += 100;
if (ast_goto_if_exists(chan, chan->context, chan->exten, chan->priority + 101)) {
LOCAL_USER_REMOVE(u);
return 0;
}
@@ -2588,8 +2584,7 @@ static int upqm_exec(struct ast_channel *chan, void *data)
if (set_member_paused(queuename, interface, 0)) {
ast_log(LOG_WARNING, "Attempt to unpause interface %s, not found\n", interface);
if (ast_exists_extension(chan, chan->context, chan->exten, chan->priority + 101, chan->cid.cid_num)) {
chan->priority += 100;
if (ast_goto_if_exists(chan, chan->context, chan->exten, chan->priority + 101)) {
LOCAL_USER_REMOVE(u);
return 0;
}
@@ -2645,9 +2640,7 @@ static int rqm_exec(struct ast_channel *chan, void *data)
break;
case RES_EXISTS:
ast_log(LOG_WARNING, "Unable to remove interface '%s' from queue '%s': Not there\n", interface, queuename);
if (ast_exists_extension(chan, chan->context, chan->exten, chan->priority + 101, chan->cid.cid_num)) {
chan->priority += 100;
}
ast_goto_if_exists(chan, chan->context, chan->exten, chan->priority + 101);
res = 0;
break;
case RES_NOSUCHQUEUE:
@@ -2722,9 +2715,7 @@ static int aqm_exec(struct ast_channel *chan, void *data)
break;
case RES_EXISTS:
ast_log(LOG_WARNING, "Unable to add interface '%s' to queue '%s': Already there\n", interface, queuename);
if (ast_exists_extension(chan, chan->context, chan->exten, chan->priority + 101, chan->cid.cid_num)) {
chan->priority += 100;
}
ast_goto_if_exists(chan, chan->context, chan->exten, chan->priority + 101);
res = 0;
break;
case RES_NOSUCHQUEUE: