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/stream.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/stream.c')
-rw-r--r-- | runtime/stream.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/stream.c b/runtime/stream.c index 773da319..f13258b5 100644 --- a/runtime/stream.c +++ b/runtime/stream.c @@ -539,7 +539,7 @@ strmReadLine(strm_t *pThis, cstr_t **ppCStr) CHKiRet(rsCStrAppendChar(*ppCStr, c)); CHKiRet(strmReadChar(pThis, &c)); } - CHKiRet(rsCStrFinish(*ppCStr)); + CHKiRet(cstrFinalize(*ppCStr)); finalize_it: if(iRet != RS_RET_OK && *ppCStr != NULL) |