summaryrefslogtreecommitdiff
path: root/outchannel.c
diff options
context:
space:
mode:
authorIgor Pashev <pashev.igor@gmail.com>2014-10-01 17:56:20 +0400
committerIgor Pashev <pashev.igor@gmail.com>2014-10-01 17:56:20 +0400
commitc046f7bcc92281465917e026f83fd0d38569cb06 (patch)
tree711f61cf319e171a5f41c469ef30e3298c8917f8 /outchannel.c
parent17262528e2277c3d069c4a29ed098830d4fdbc08 (diff)
parent7ec8c6d6f9114765775ea5100af5b0b20af4502e (diff)
downloadrsyslog-c046f7bcc92281465917e026f83fd0d38569cb06.tar.gz
Merge branch 'master' of git://anonscm.debian.org/collab-maint/rsyslog
Conflicts: debian/changelog debian/patches/series debian/rules
Diffstat (limited to 'outchannel.c')
-rw-r--r--outchannel.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/outchannel.c b/outchannel.c
index c97d220..ac2e087 100644
--- a/outchannel.c
+++ b/outchannel.c
@@ -110,7 +110,7 @@ static rsRetVal get_Field(uchar **pp, uchar **pField)
*pp = p;
CHKiRet(cstrFinalize(pStrB));
- CHKiRet(cstrConvSzStrAndDestruct(pStrB, pField, 0));
+ CHKiRet(cstrConvSzStrAndDestruct(&pStrB, pField, 0));
finalize_it:
if(iRet != RS_RET_OK) {
@@ -178,7 +178,7 @@ static inline rsRetVal get_restOfLine(uchar **pp, uchar **pBuf)
*pp = p;
CHKiRet(cstrFinalize(pStrB));
- CHKiRet(cstrConvSzStrAndDestruct(pStrB, pBuf, 0));
+ CHKiRet(cstrConvSzStrAndDestruct(&pStrB, pBuf, 0));
finalize_it:
if(iRet != RS_RET_OK) {