diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-10-01 17:00:07 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-10-01 17:00:07 +0200 |
| commit | d33a48656094bde5f190abb15588a6e5b930b6eb (patch) | |
| tree | ac58edb9f7225021eed362e51b478c8fb43ad01d /tools | |
| parent | 176f773a2e7d29d45e06980e684d293fa3352d72 (diff) | |
| parent | cb9761627630dc8aeafbbfcfe091f87b66b5a92a (diff) | |
| download | rsyslog-d33a48656094bde5f190abb15588a6e5b930b6eb.tar.gz rsyslog-d33a48656094bde5f190abb15588a6e5b930b6eb.tar.xz rsyslog-d33a48656094bde5f190abb15588a6e5b930b6eb.zip | |
Merge branch 'v4-stable' into v4-beta
Conflicts:
runtime/rsyslog.h
tools/syslogd.c
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/syslogd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/syslogd.c b/tools/syslogd.c index 2e6de66c..512412da 100644 --- a/tools/syslogd.c +++ b/tools/syslogd.c @@ -1095,7 +1095,7 @@ int parseRFCSyslogMsg(msg_t *pMsg, int flags) assert(pMsg != NULL); assert(pMsg->pszRawMsg != NULL); p2parse = pMsg->pszRawMsg + pMsg->offAfterPRI; /* point to start of text, after PRI */ - lenMsg = pMsg->iLenRawMsg - (pMsg->offAfterPRI); + lenMsg = pMsg->iLenRawMsg - pMsg->offAfterPRI; /* do a sanity check on the version and eat it (the caller checked this already) */ assert(p2parse[0] == '1' && p2parse[1] == ' '); |