diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-12-16 13:00:27 +0100 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-12-16 13:00:27 +0100 |
commit | 4da2cbcae7d55a1a9877b3eee4cbce5bb2540a21 (patch) | |
tree | 70b8123a9d7d648fe007e8f6c01466e9b26fd4e1 /runtime/msg.c | |
parent | c4c20c18aae7c95c1e69c10d2ea9efbc3c2c1913 (diff) | |
parent | 371a8eec29fa25bbf58f4b1f0d7e3bf4c3ad6329 (diff) | |
download | rsyslog-4da2cbcae7d55a1a9877b3eee4cbce5bb2540a21.tar.gz rsyslog-4da2cbcae7d55a1a9877b3eee4cbce5bb2540a21.tar.xz rsyslog-4da2cbcae7d55a1a9877b3eee4cbce5bb2540a21.zip |
Merge branch 'v4-stable' into v4-devel
Conflicts:
runtime/parser.c
Diffstat (limited to 'runtime/msg.c')
-rw-r--r-- | runtime/msg.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/runtime/msg.c b/runtime/msg.c index 10c5f82a..c450d6bd 100644 --- a/runtime/msg.c +++ b/runtime/msg.c @@ -1485,7 +1485,7 @@ rsRetVal MsgSetPROCID(msg_t *pMsg, char* pszPROCID) CHKiRet(cstrConstruct(&pMsg->pCSPROCID)); } /* if we reach this point, we have the object */ - iRet = rsCStrSetSzStr(pMsg->pCSPROCID, (uchar*) pszPROCID); + CHKiRet(rsCStrSetSzStr(pMsg->pCSPROCID, (uchar*) pszPROCID)); CHKiRet(cstrFinalize(pMsg->pCSPROCID)); finalize_it: @@ -2881,7 +2881,6 @@ uchar *MsgGetProp(msg_t *pMsg, struct templateEntry *pTpe, if(pTpe->data.field.options.bCSV) { /* we need to obtain a private copy, as we need to at least add the double quotes */ int iBufLen; - int i; uchar *pBStart; uchar *pDst; uchar *pSrc; @@ -2896,7 +2895,6 @@ uchar *MsgGetProp(msg_t *pMsg, struct templateEntry *pTpe, RET_OUT_OF_MEMORY; } pSrc = pRes; - i = 0; *pDst++ = '"'; /* starting quote */ while(*pSrc) { if(*pSrc == '"') |