diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-06-16 12:59:55 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-06-16 12:59:55 +0200 |
| commit | 98348ae03d217d1971c54ff135b6a5ce1dff7087 (patch) | |
| tree | cced038bdf003e375a77a47aa7ea7b4183553664 /runtime/ctok.c | |
| parent | 4af40abc0a9cdc9f328830b6074f6182f43c171a (diff) | |
| parent | 74b2b24f508be90d20961304d5e3cce648f3eb7c (diff) | |
| download | rsyslog-98348ae03d217d1971c54ff135b6a5ce1dff7087.tar.gz rsyslog-98348ae03d217d1971c54ff135b6a5ce1dff7087.tar.xz rsyslog-98348ae03d217d1971c54ff135b6a5ce1dff7087.zip | |
Merge branch 'master' into omfile
Conflicts:
ChangeLog
runtime/msg.h
tcps_sess.c
tcpsrv.c
tools/syslogd.c
Diffstat (limited to 'runtime/ctok.c')
| -rw-r--r-- | runtime/ctok.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/ctok.c b/runtime/ctok.c index d2cd8bbd..263e656c 100644 --- a/runtime/ctok.c +++ b/runtime/ctok.c @@ -269,7 +269,7 @@ ctokGetVar(ctok_t *pThis, ctok_token_t *pToken) } CHKiRet(ctokUngetCharFromStream(pThis, c)); /* put not processed char back */ - CHKiRet(rsCStrFinish(pstrVal)); + CHKiRet(cstrFinalize(pstrVal)); CHKiRet(var.SetString(pToken->pVar, pstrVal)); pstrVal = NULL; @@ -319,7 +319,7 @@ ctokGetSimpStr(ctok_t *pThis, ctok_token_t *pToken) } CHKiRet(ctokGetCharFromStream(pThis, &c)); } - CHKiRet(rsCStrFinish(pStrB)); + CHKiRet(cstrFinalize(pstrVal)); CHKiRet(var.SetString(pToken->pVar, pstrVal)); pstrVal = NULL; |