diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-09 15:39:09 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-09 15:39:09 +0100 |
| commit | 603c5f62fad710f035d385d046c843d8bf6e40ef (patch) | |
| tree | aa5cfe9f0be4d615b0052617807b5a0c0cf4187a /runtime/msg.c | |
| parent | 7dfc7c709ffe09669e8c79661faea21451cca603 (diff) | |
| parent | cc0da38a4becfd5a152438823437f671234e3a3b (diff) | |
| download | rsyslog-603c5f62fad710f035d385d046c843d8bf6e40ef.tar.gz rsyslog-603c5f62fad710f035d385d046c843d8bf6e40ef.tar.xz rsyslog-603c5f62fad710f035d385d046c843d8bf6e40ef.zip | |
Merge branch 'v6-stable'
Conflicts:
ChangeLog
configure.ac
doc/manual.html
Diffstat (limited to 'runtime/msg.c')
| -rw-r--r-- | runtime/msg.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/runtime/msg.c b/runtime/msg.c index 7e469885..f457e072 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. * @@ -1601,7 +1601,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(""); @@ -1834,7 +1834,7 @@ static inline char *getStructuredData(msg_t *pM) { uchar *pszRet; - MsgUnlock(pM); + MsgLock(pM); if(pM->pCSStrucData == NULL) pszRet = UCHAR_CONSTANT("-"); else @@ -1882,7 +1882,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(""); @@ -1940,7 +1940,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(""); |