diff options
| author | vague666 <jari.matilainen@gmail.com> | 2018-06-07 15:17:46 +0200 |
|---|---|---|
| committer | vague666 <jari.matilainen@gmail.com> | 2018-06-07 15:17:46 +0200 |
| commit | d2e1caf7205220c9fd73861604de8248eb07f0d6 (patch) | |
| tree | baad9ff5b97afdc22481417451e5863fe348842d | |
| parent | 1547248e9448c22476a56c630ee18d95a57dc05f (diff) | |
| download | irssi-d2e1caf7205220c9fd73861604de8248eb07f0d6.zip | |
simplifying code
| -rw-r--r-- | src/core/ignore.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/core/ignore.c b/src/core/ignore.c index 8aece6fc..574ecb5d 100644 --- a/src/core/ignore.c +++ b/src/core/ignore.c @@ -81,10 +81,11 @@ static int ignore_match_pattern(IGNORE_REC *rec, const char *text) * used as a flag to indicate it should only look at ignore items with NO_ACT. * However we also want to allow NO_ACT combined with levels, so mask it out and * match levels if set. */ +#define FLAG_MSGLEVELS ( MSGLEVEL_NO_ACT | MSGLEVEL_HIDDEN ) #define ignore_match_level(rec, level) \ - (((level & (MSGLEVEL_NO_ACT|MSGLEVEL_HIDDEN)) != 0) ? \ - ((~(MSGLEVEL_NO_ACT|MSGLEVEL_HIDDEN) & level) & (rec)->level) != 0 : \ - ((rec)->level & (MSGLEVEL_NO_ACT|MSGLEVEL_HIDDEN) ? 0 : \ + (((level & FLAG_MSGLEVELS)!= 0) ? \ + ((~FLAG_MSGLEVELS & level) & (rec)->level) != 0 : \ + ((rec)->level & FLAG_MSGLEVELS ? 0 : \ (level & (rec)->level) != 0)) #define ignore_match_nickmask(rec, nick, nickmask) \ |