diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-02-01 19:27:22 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-02-01 19:27:22 +0000 |
| commit | 634731c0244d60d70f667d65171475a1ade08ca2 (patch) | |
| tree | d3073c9a7053f9b7c4950d73de86de23f6c84d70 /funcs | |
| parent | 644a534ca06101b53a47e17bb0279b1361ecb5d9 (diff) | |
Merged revisions 53070 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r53070 | tilghman | 2007-02-01 13:21:20 -0600 (Thu, 01 Feb 2007) | 10 lines
Merged revisions 53069 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r53069 | tilghman | 2007-02-01 13:13:53 -0600 (Thu, 01 Feb 2007) | 2 lines
No wonder FIELDQTY doesn't work with functions... the documentation in pbx.c was wrong
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@53071 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'funcs')
| -rw-r--r-- | funcs/func_strings.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/funcs/func_strings.c b/funcs/func_strings.c index 8088f4db5..c7fc485fd 100644 --- a/funcs/func_strings.c +++ b/funcs/func_strings.c @@ -48,7 +48,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") static int function_fieldqty(struct ast_channel *chan, const char *cmd, char *parse, char *buf, size_t len) { - char *varval; + const char *varval; + char *varval2 = NULL; int fieldcount = 0; AST_DECLARE_APP_ARGS(args, AST_APP_ARG(varname); @@ -57,7 +58,6 @@ static int function_fieldqty(struct ast_channel *chan, const char *cmd, AST_STANDARD_APP_ARGS(args, parse); if (args.delim) { - pbx_retrieve_variable(chan, args.varname, &varval, buf, len, NULL); if (args.delim[0] == '\\') { if (args.delim[1] == 'n') ast_copy_string(args.delim, "\n", 2); @@ -68,7 +68,10 @@ static int function_fieldqty(struct ast_channel *chan, const char *cmd, else ast_copy_string(args.delim, "-", 2); } - while (strsep(&varval, args.delim)) + varval = pbx_builtin_getvar_helper(chan, args.varname); + if (varval) + varval2 = ast_strdupa(varval); + while (strsep(&varval2, args.delim)) fieldcount++; } else { fieldcount = 1; |