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/debug.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/debug.c')
| -rw-r--r-- | runtime/debug.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/runtime/debug.c b/runtime/debug.c index 0ada909b..81b45d41 100644 --- a/runtime/debug.c +++ b/runtime/debug.c @@ -435,14 +435,13 @@ dbgMutLog_t *dbgMutLogFindHolder(pthread_mutex_t *pmut) static inline void dbgMutexPreLockLog(pthread_mutex_t *pmut, dbgFuncDB_t *pFuncDB, int ln) { dbgMutLog_t *pHolder; - dbgMutLog_t *pLog; char pszBuf[128]; char pszHolderThrdName[64]; char *pszHolder; pthread_mutex_lock(&mutMutLog); pHolder = dbgMutLogFindHolder(pmut); - pLog = dbgMutLogAddEntry(pmut, MUTOP_LOCKWAIT, pFuncDB, ln); + dbgMutLogAddEntry(pmut, MUTOP_LOCKWAIT, pFuncDB, ln); if(pHolder == NULL) pszHolder = "[NONE]"; @@ -483,14 +482,13 @@ static inline void dbgMutexLockLog(pthread_mutex_t *pmut, dbgFuncDB_t *pFuncDB, static inline void dbgMutexPreTryLockLog(pthread_mutex_t *pmut, dbgFuncDB_t *pFuncDB, int ln) { dbgMutLog_t *pHolder; - dbgMutLog_t *pLog; char pszBuf[128]; char pszHolderThrdName[64]; char *pszHolder; pthread_mutex_lock(&mutMutLog); pHolder = dbgMutLogFindHolder(pmut); - pLog = dbgMutLogAddEntry(pmut, MUTOP_TRYLOCK, pFuncDB, ln); + dbgMutLogAddEntry(pmut, MUTOP_TRYLOCK, pFuncDB, ln); if(pHolder == NULL) pszHolder = "[NONE]"; |