diff options
author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-02-01 19:13:53 +0000 |
---|---|---|
committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-02-01 19:13:53 +0000 |
commit | d1cbba26808852d22f9e2a4077a7286167d5654b (patch) | |
tree | 242156155c85689baba745468ada5559f909f037 | |
parent | 429708be61aa87849d22506b160268529e333966 (diff) |
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.2@53069 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r-- | funcs/func_strings.c | 6 | ||||
-rw-r--r-- | pbx.c | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/funcs/func_strings.c b/funcs/func_strings.c index 27c457dd4..6da95b54c 100644 --- a/funcs/func_strings.c +++ b/funcs/func_strings.c @@ -41,13 +41,15 @@ static char *function_fieldqty(struct ast_channel *chan, char *cmd, char *data, char *buf, size_t len) { - char *varname, *varval, workspace[256]; + char *varname, *varval; char *delim = ast_strdupa(data); int fieldcount = 0; if (delim) { varname = strsep(&delim, "|"); - pbx_retrieve_variable(chan, varname, &varval, workspace, sizeof(workspace), NULL); + varval = pbx_builtin_getvar_helper(chan, varname); + if (varval) + varval = ast_strdupa(varval); if (delim) { while (strsep(&varval, delim)) fieldcount++; @@ -974,8 +974,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) { |