[asterisk-commits] murf: branch murf/fast-ast r40930 - in /team/murf/fast-ast: ./ res/res_agi.c

[asterisk-commits at lists.digium.com]

Author: murf
Date: Wed Aug 23 12:48:39 2006
New Revision: 40930

URL: http://svn.digium.com/view/asterisk?rev=40930&view=rev
Log:
Merged revisions 40904,40928 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r40904 | tilghman | 2006-08-23 10:14:18 -0600 (Wed, 23 Aug 2006) | 10 lines

Merged revisions 40901 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r40901 | tilghman | 2006-08-23 11:05:26 -0500 (Wed, 23 Aug 2006) | 2 lines

Revert last change - breaks retrieval of builtin variables

........

................
r40928 | russell | 2006-08-23 11:44:33 -0600 (Wed, 23 Aug 2006) | 2 lines

remove svnmerge-integrated property

................

Modified:
    team/murf/fast-ast/   (props changed)
    team/murf/fast-ast/res/res_agi.c

Propchange: team/murf/fast-ast/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Propchange: team/murf/fast-ast/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Aug 23 12:48:39 2006
@@ -1,1 +1,1 @@
-/trunk:1-40883
+/trunk:1-40929

Modified: team/murf/fast-ast/res/res_agi.c
URL: http://svn.digium.com/view/asterisk/team/murf/fast-ast/res/res_agi.c?rev=40930&r1=40929&r2=40930&view=diff
==============================================================================
--- team/murf/fast-ast/res/res_agi.c (original)
+++ team/murf/fast-ast/res/res_agi.c Wed Aug 23 12:48:39 2006
@@ -1164,17 +1164,18 @@
 
 static int handle_getvariable(struct ast_channel *chan, AGI *agi, int argc, char **argv)
 {
-	const char *ret;
+	char *ret;
 	char tempstr[1024];
 
 	if (argc != 3)
 		return RESULT_SHOWUSAGE;
 
 	/* check if we want to execute an ast_custom_function */
-	if (!ast_strlen_zero(argv[2]) && (argv[2][strlen(argv[2]) - 1] == ')'))
+	if (!ast_strlen_zero(argv[2]) && (argv[2][strlen(argv[2]) - 1] == ')')) {
 		ret = ast_func_read(chan, argv[2], tempstr, sizeof(tempstr)) ? NULL : tempstr;
-	else
-		ret = pbx_builtin_getvar_helper(chan, argv[2]);
+	} else {
+		pbx_retrieve_variable(chan, argv[2], &ret, tempstr, sizeof(tempstr), NULL);
+	}
 
 	if (ret)
 		fdprintf(agi->fd, "200 result=1 (%s)\n", ret);