diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-07-11 11:24:08 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-07-11 11:24:08 +0200 |
| commit | 3b63b155ed5e4d58858baa3d6f07293099d8a4e5 (patch) | |
| tree | 38e8065408eddf7acfdb5172d5a9b364bd436d72 /runtime/conf.c | |
| parent | b035298e30a5caebbf9dbb7b57ad4e17497b2abf (diff) | |
| parent | 4e11040e04c7147f9787e2a496591f7ada190480 (diff) | |
| download | rsyslog-3b63b155ed5e4d58858baa3d6f07293099d8a4e5.tar.gz rsyslog-3b63b155ed5e4d58858baa3d6f07293099d8a4e5.tar.xz rsyslog-3b63b155ed5e4d58858baa3d6f07293099d8a4e5.zip | |
Merge branch 'v5-devel'
Conflicts:
ChangeLog
configure.ac
doc/manual.html
runtime/rsyslog.h
Diffstat (limited to 'runtime/conf.c')
| -rw-r--r-- | runtime/conf.c | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/runtime/conf.c b/runtime/conf.c index 6a2e57fa..0dd53754 100644 --- a/runtime/conf.c +++ b/runtime/conf.c @@ -653,17 +653,14 @@ static rsRetVal cflineProcessTradPRIFilter(uchar **pline, register rule_t *pRule for (bp=buf; *(bp+1); bp++) *bp=*(bp+1); *bp='\0'; - } - else { + } else { ignorepri = 0; } - if ( *buf == '=' ) - { + if ( *buf == '=' ) { singlpri = 1; pri = decodeSyslogName(&buf[1], syslogPriNames); } - else { - singlpri = 0; + else { singlpri = 0; pri = decodeSyslogName(buf, syslogPriNames); } @@ -691,17 +688,13 @@ static rsRetVal cflineProcessTradPRIFilter(uchar **pline, register rule_t *pRule pRule->f_filterData.f_pmask[i] &= ~(1<<pri); else pRule->f_filterData.f_pmask[i] |= (1<<pri); - } - else - { + } else { if ( pri == TABLE_ALLPRI ) { if ( ignorepri ) pRule->f_filterData.f_pmask[i] = TABLE_NOPRI; else pRule->f_filterData.f_pmask[i] = TABLE_ALLPRI; - } - else - { + } else { if ( ignorepri ) for (i2= 0; i2 <= pri; ++i2) pRule->f_filterData.f_pmask[i] &= ~(1<<i2); |