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/parser.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/parser.c')
| -rw-r--r-- | runtime/parser.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/runtime/parser.c b/runtime/parser.c index 810bf42b..fdda9546 100644 --- a/runtime/parser.c +++ b/runtime/parser.c @@ -272,7 +272,6 @@ rsRetVal parseMsg(msg_t *pMsg) uchar *msg; int pri; int lenMsg; - int iPriText; if(pMsg->iLenRawMsg == 0) ABORT_FINALIZE(RS_RET_EMPTY_MSG); @@ -286,7 +285,6 @@ rsRetVal parseMsg(msg_t *pMsg) lenMsg = pMsg->iLenRawMsg; msg = pMsg->pszRawMsg; pri = DEFUPRI; - iPriText = 0; if(pMsg->msgFlags & NO_PRI_IN_RAW) { /* In this case, simply do so as if the pri would be right at top */ MsgSetAfterPRIOffs(pMsg, 0); |