diff options
| author | Michael Biebl <biebl@debian.org> | 2010-11-30 15:09:49 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2010-11-30 15:09:49 +0100 |
| commit | 0a5a3fba01d42ef3b380c4ae27699bb42c3af493 (patch) | |
| tree | cba36f6ed3cf72059d16e4e702be01325c1f73c7 /runtime/msg.c | |
| parent | 7e2b1add5ffd1d726801b5f3806c7e26f493c3e9 (diff) | |
| download | rsyslog-0a5a3fba01d42ef3b380c4ae27699bb42c3af493.tar.gz | |
Imported Upstream version 5.7.2upstream/5.7.2
Diffstat (limited to 'runtime/msg.c')
| -rw-r--r-- | runtime/msg.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/msg.c b/runtime/msg.c index 1b18826..82565f1 100644 --- a/runtime/msg.c +++ b/runtime/msg.c @@ -851,7 +851,7 @@ CODESTARTobjDestruct(msg) * that we trim too often when the counter wraps. */ static unsigned iTrimCtr = 1; - currCnt = ATOMIC_INC_AND_FETCH(&iTrimCtr, &mutTrimCtr); + currCnt = ATOMIC_INC_AND_FETCH_unsigned(&iTrimCtr, &mutTrimCtr); if(currCnt % 100000 == 0) { malloc_trim(128*1024); } @@ -2588,7 +2588,7 @@ uchar *MsgGetProp(msg_t *pMsg, struct templateEntry *pTpe, bFound = 1; } else { dbgprintf("regex found at offset %d, new offset %d, tries %d\n", - iOffs, iOffs + pmatch[0].rm_eo, iTry); + iOffs, (int) (iOffs + pmatch[0].rm_eo), iTry); iOffs += pmatch[0].rm_eo; ++iTry; } |