summaryrefslogtreecommitdiffstats
path: root/runtime/expr.c
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2009-04-21 16:55:09 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2009-04-21 16:55:09 +0200
commit9e99fa5812d9653547327eafd640dc60277c89dd (patch)
treeae739ed79f1efe0d70de6a8c99515ae15b6e2960 /runtime/expr.c
parent88caccecf8dd8beaf46915df05241a44f7d635f6 (diff)
parentaa43d7f83125f20f8efdf4152bdd9a09e7a81495 (diff)
downloadrsyslog-9e99fa5812d9653547327eafd640dc60277c89dd.tar.gz
rsyslog-9e99fa5812d9653547327eafd640dc60277c89dd.tar.xz
rsyslog-9e99fa5812d9653547327eafd640dc60277c89dd.zip
Merge branch 'nextmaster'
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");