diff options
author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-11-19 13:19:49 +0000 |
---|---|---|
committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-11-19 13:19:49 +0000 |
commit | 84de3e7ec27cbda09e16e0c2a49e330862ac271f (patch) | |
tree | 01ab767bcc6afcdf0de8f3c318a97b5122cb720e /apps | |
parent | 296683f301336b411ceef41a96ebe5a9684fc6e0 (diff) |
Merged revisions 157706 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r157706 | kpfleming | 2008-11-19 06:42:19 -0600 (Wed, 19 Nov 2008) | 5 lines
make some corrections to the ast_agi_register_multiple(), ast_agi_unregister_multiple() and ast_agi_fdprintf() API calls to be consistent with API guidelines
also, move UPGRADE.txt to UPGRADE-1.6.txt and make the new UPGRADE.txt contain information about upgrading between Asterisk 1.6 releases
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@157738 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps')
-rw-r--r-- | apps/app_stack.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/apps/app_stack.c b/apps/app_stack.c index 841562536..a6333d8d4 100644 --- a/apps/app_stack.c +++ b/apps/app_stack.c @@ -406,11 +406,11 @@ static int handle_gosub(struct ast_channel *chan, AGI *agi, int argc, char **arg /* Lookup the priority label */ if ((priority = ast_findlabel_extension(chan, argv[1], argv[2], argv[3], chan->cid.cid_num)) < 0) { ast_log(LOG_ERROR, "Priority '%s' not found in '%s@%s'\n", argv[3], argv[2], argv[1]); - ast_agi_fdprintf(chan, agi->fd, "200 result=-1 Gosub label not found\n"); + ast_agi_send(agi->fd, chan, "200 result=-1 Gosub label not found\n"); return RESULT_FAILURE; } } else if (!ast_exists_extension(chan, argv[1], argv[2], priority, chan->cid.cid_num)) { - ast_agi_fdprintf(chan, agi->fd, "200 result=-1 Gosub label not found\n"); + ast_agi_send(agi->fd, chan, "200 result=-1 Gosub label not found\n"); return RESULT_FAILURE; } @@ -421,7 +421,7 @@ static int handle_gosub(struct ast_channel *chan, AGI *agi, int argc, char **arg if (!(theapp = pbx_findapp("Gosub"))) { ast_log(LOG_ERROR, "Gosub() cannot be found in the list of loaded applications\n"); - ast_agi_fdprintf(chan, agi->fd, "503 result=-2 Gosub is not loaded\n"); + ast_agi_send(agi->fd, chan, "503 result=-2 Gosub is not loaded\n"); return RESULT_FAILURE; } @@ -455,19 +455,19 @@ static int handle_gosub(struct ast_channel *chan, AGI *agi, int argc, char **arg struct ast_pbx *pbx = chan->pbx; /* Suppress warning about PBX already existing */ chan->pbx = NULL; - ast_agi_fdprintf(chan, agi->fd, "100 result=0 Trying...\n"); + ast_agi_send(agi->fd, chan, "100 result=0 Trying...\n"); ast_pbx_run(chan); - ast_agi_fdprintf(chan, agi->fd, "200 result=0 Gosub complete\n"); + ast_agi_send(agi->fd, chan, "200 result=0 Gosub complete\n"); if (chan->pbx) { ast_free(chan->pbx); } chan->pbx = pbx; } else { - ast_agi_fdprintf(chan, agi->fd, "200 result=%d Gosub failed\n", res); + ast_agi_send(agi->fd, chan, "200 result=%d Gosub failed\n", res); } ast_free(gosub_args); } else { - ast_agi_fdprintf(chan, agi->fd, "503 result=-2 Memory allocation failure\n"); + ast_agi_send(agi->fd, chan, "503 result=-2 Memory allocation failure\n"); return RESULT_FAILURE; } |