summaryrefslogtreecommitdiffstats
path: root/runtime/expr.c
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2009-04-07 15:28:06 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2009-04-07 15:28:06 +0200
commitf7f0902f65b7693b8b3ebc3064b5ea188e614bf9 (patch)
tree39e9d3d6d3533afff62c72044dea723e6c70a2c3 /runtime/expr.c
parent1a08fa5ded3087a3b60d87a20d25a4ec589eba21 (diff)
parenta6c743e5ec5d213d3aa6404553fe65d59f065799 (diff)
downloadrsyslog-f7f0902f65b7693b8b3ebc3064b5ea188e614bf9.tar.gz
rsyslog-f7f0902f65b7693b8b3ebc3064b5ea188e614bf9.tar.bz2
rsyslog-f7f0902f65b7693b8b3ebc3064b5ea188e614bf9.zip
Merge branch 'nextmaster' into oracle
Diffstat (limited to 'runtime/expr.c')
-rw-r--r--runtime/expr.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/runtime/expr.c b/runtime/expr.c
index 38ed1c68..e449d1c7 100644
--- a/runtime/expr.c
+++ b/runtime/expr.c
@@ -142,7 +142,9 @@ terminal(expr_t *pThis, ctok_t *tok)
* we have all relevant information)
*/
CHKiRet(ctok_token.UnlinkVar(pToken, &pVar));
- CHKiRet(vmprg.AddVarOperation(pThis->pVmprg, opcode_FUNC_CALL, pVar)); /* add to program */
+ CHKiRet(var.ConvToString(pVar)); /* make sure we have a string */
+ CHKiRet(vmprg.AddCallOperation(pThis->pVmprg, pVar->val.pStr)); /* add to program */
+ CHKiRet(var.Destruct(&pVar));
break;
case ctok_MSGVAR:
dbgoprint((obj_t*) pThis, "MSGVAR\n");