diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-02-01 19:21:20 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-02-01 19:21:20 +0000 |
| commit | 289dc405482d3d3798aaf7f48fcf6defe02e3003 (patch) | |
| tree | 0f956b0de920ffc5bd5a84c517e0a7539c392eae | |
| parent | 5a7c75df3c803244e94b3224ccd81af3d4f7b131 (diff) | |
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/branches/1.4@53070 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | funcs/func_strings.c | 9 | ||||
| -rw-r--r-- | main/pbx.c | 3 |
2 files changed, 7 insertions, 5 deletions
diff --git a/funcs/func_strings.c b/funcs/func_strings.c index 10712ae92..c90d047e1 100644 --- a/funcs/func_strings.c +++ b/funcs/func_strings.c @@ -46,7 +46,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") static int function_fieldqty(struct ast_channel *chan, 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); @@ -55,8 +56,10 @@ static int function_fieldqty(struct ast_channel *chan, char *cmd, AST_STANDARD_APP_ARGS(args, parse); if (args.delim) { - pbx_retrieve_variable(chan, args.varname, &varval, buf, len, NULL); - 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; diff --git a/main/pbx.c b/main/pbx.c index 230b06b9f..9e97f1293 100644 --- a/main/pbx.c +++ b/main/pbx.c @@ -1097,8 +1097,7 @@ static char *substring(const char *value, int offset, int length, char *workspac return ret; } -/*! \brief pbx_retrieve_variable: Support for Asterisk built-in variables and - functions in the dialplan +/*! \brief pbx_retrieve_variable: Support for Asterisk built-in variables ---*/ void pbx_retrieve_variable(struct ast_channel *c, const char *var, char **ret, char *workspace, int workspacelen, struct varshead *headp) { |