diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-12-17 13:20:55 +0100 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-12-17 13:20:55 +0100 |
commit | bcc3b2aef74534cebc39f1351927756d144a7942 (patch) | |
tree | 9c182438089a48f4653be0a34cc6105348d26dfb /runtime/msg.c | |
parent | b9cc60deeb0201e263ee011a20b0bce4eb6001f4 (diff) | |
parent | 68c13f3f6a691c7f854e6fa4caff43295896dbde (diff) | |
download | rsyslog-bcc3b2aef74534cebc39f1351927756d144a7942.tar.gz rsyslog-bcc3b2aef74534cebc39f1351927756d144a7942.tar.xz rsyslog-bcc3b2aef74534cebc39f1351927756d144a7942.zip |
Merge branch 'v5-devel'
Conflicts:
ChangeLog
action.c
plugins/imudp/imudp.c
runtime/glbl.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 65ea101f..ad045dec 100644 --- a/runtime/msg.c +++ b/runtime/msg.c @@ -1558,7 +1558,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: @@ -3034,7 +3034,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; @@ -3049,7 +3048,6 @@ uchar *MsgGetProp(msg_t *pMsg, struct templateEntry *pTpe, RET_OUT_OF_MEMORY; } pSrc = pRes; - i = 0; *pDst++ = '"'; /* starting quote */ while(*pSrc) { if(*pSrc == '"') |