diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-09 15:07:02 +0100 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-09 15:07:02 +0100 |
commit | 1414dacae03c90c1ab83c04227474ecac7d40c76 (patch) | |
tree | 287761f728e2e84aaec118e7664495dd5d196b04 /runtime | |
parent | 5c0cff0e5a3a1a00b6176af7e4fefbdc5af8f9a3 (diff) | |
parent | 791b16ce06d75944e338a6e5fa14c0394bde6f1d (diff) | |
download | rsyslog-1414dacae03c90c1ab83c04227474ecac7d40c76.tar.gz rsyslog-1414dacae03c90c1ab83c04227474ecac7d40c76.tar.xz rsyslog-1414dacae03c90c1ab83c04227474ecac7d40c76.zip |
Merge branch 'v5-stable' into v6-stable
Diffstat (limited to 'runtime')
-rw-r--r-- | runtime/msg.c | 10 | ||||
-rw-r--r-- | runtime/statsobj.c | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/runtime/msg.c b/runtime/msg.c index 9cafbf7b..a52d0cce 100644 --- a/runtime/msg.c +++ b/runtime/msg.c @@ -7,7 +7,7 @@ * of the "old" message code without any modifications. However, it * helps to have things at the right place one we go to the meat of it. * - * Copyright 2007, 2008 Rainer Gerhards and Adiscon GmbH. + * Copyright 2007-2012 Rainer Gerhards and Adiscon GmbH. * * This file is part of the rsyslog runtime library. * @@ -1621,7 +1621,7 @@ char *getPROCID(msg_t *pM, sbool bLockMutex) ISOBJ_TYPE_assert(pM, msg); if(bLockMutex == LOCK_MUTEX) - MsgUnlock(pM); + MsgLock(pM); preparePROCID(pM, MUTEX_ALREADY_LOCKED); if(pM->pCSPROCID == NULL) pszRet = UCHAR_CONSTANT(""); @@ -1858,7 +1858,7 @@ static inline char *getStructuredData(msg_t *pM) { uchar *pszRet; - MsgUnlock(pM); + MsgLock(pM); if(pM->pCSStrucData == NULL) pszRet = UCHAR_CONSTANT("-"); else @@ -1906,7 +1906,7 @@ uchar *getProgramName(msg_t *pM, sbool bLockMutex) uchar *pszRet; if(bLockMutex == LOCK_MUTEX) - MsgUnlock(pM); + MsgLock(pM); prepareProgramName(pM, MUTEX_ALREADY_LOCKED); if(pM->pCSProgName == NULL) pszRet = UCHAR_CONSTANT(""); @@ -1964,7 +1964,7 @@ char *getAPPNAME(msg_t *pM, sbool bLockMutex) assert(pM != NULL); if(bLockMutex == LOCK_MUTEX) - MsgUnlock(pM); + MsgLock(pM); prepareAPPNAME(pM, MUTEX_ALREADY_LOCKED); if(pM->pCSAPPNAME == NULL) pszRet = UCHAR_CONSTANT(""); diff --git a/runtime/statsobj.c b/runtime/statsobj.c index e1a89cf4..131605e0 100644 --- a/runtime/statsobj.c +++ b/runtime/statsobj.c @@ -154,9 +154,11 @@ addCounter(statsobj_t *pThis, uchar *ctrName, statsCtrType_t ctrType, void *pCtr switch(ctrType) { case ctrType_IntCtr: ctr->val.pIntCtr = (intctr_t*) pCtr; + *(ctr->val.pIntCtr) = 0; break; case ctrType_Int: ctr->val.pInt = (int*) pCtr; + *(ctr->val.pInt) = 0; break; } addCtrToList(pThis, ctr); |