diff options
author | root <root@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-08-15 23:04:36 +0000 |
---|---|---|
committer | root <root@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-08-15 23:04:36 +0000 |
commit | 25cb2f0cd7ca0039bc8edd46200592a92ee68163 (patch) | |
tree | 52c90c09b07e35050feba8fedf51f4276ed35db2 /res | |
parent | 70c0723370e66f74f22e57ff74ee33ddca91c3c5 (diff) |
automerge commit
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@39962 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res')
-rw-r--r-- | res/res_agi.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/res/res_agi.c b/res/res_agi.c index e9b275ed0..935e4f1d6 100644 --- a/res/res_agi.c +++ b/res/res_agi.c @@ -1161,18 +1161,17 @@ static int handle_setvariable(struct ast_channel *chan, AGI *agi, int argc, char static int handle_getvariable(struct ast_channel *chan, AGI *agi, int argc, char **argv) { - char *ret; + const 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)); - } else { - pbx_retrieve_variable(chan, argv[2], &ret, tempstr, sizeof(tempstr), NULL); - } + else + ret = pbx_builtin_getvar_helper(chan, argv[2]); if (ret) fdprintf(agi->fd, "200 result=1 (%s)\n", ret); |