From: Willem Toorop <willem@nlnetlabs.nl>
Date: Fri, 11 Mar 2016 11:56:34 +0000 (+0000)
Subject: Correct operator precedence in ev bits conversions
X-Git-Tag: release-1.5.9rc1~80
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a36136f82ca2d94267e4f5d1d94da52d76a1587f;p=thirdparty%2Funbound.git

Correct operator precedence in ev bits conversions


git-svn-id: file:///svn/unbound/trunk@3667 be551aaa-1e26-0410-a405-d3ace91eadb9
---

diff --git a/util/ub_event.c b/util/ub_event.c
index 737ef3945..b4d6ccf69 100644
--- a/util/ub_event.c
+++ b/util/ub_event.c
@@ -71,18 +71,18 @@
     UB_EV_PERSIST != EV_PERSIST 
 /* Only necessary for libev */ 
 #  define NATIVE_BITS(b) ( \
-	  ((b) & UB_EV_TIMEOUT) ? EV_TIMEOUT : 0 \
-	| ((b) & UB_EV_READ   ) ? EV_READ    : 0 \
-	| ((b) & UB_EV_WRITE  ) ? EV_WRITE   : 0 \
-	| ((b) & UB_EV_SIGNAL ) ? EV_SIGNAL  : 0 \
-	| ((b) & UB_EV_PERSIST) ? EV_PERSIST : 0)
+	  (((b) & UB_EV_TIMEOUT) ? EV_TIMEOUT : 0) \
+	| (((b) & UB_EV_READ   ) ? EV_READ    : 0) \
+	| (((b) & UB_EV_WRITE  ) ? EV_WRITE   : 0) \
+	| (((b) & UB_EV_SIGNAL ) ? EV_SIGNAL  : 0) \
+	| (((b) & UB_EV_PERSIST) ? EV_PERSIST : 0))
 
 #  define UB_EV_BITS(b) ( \
-	  ((b) & EV_TIMEOUT) ? UB_EV_TIMEOUT : 0 \
-	| ((b) & EV_READ   ) ? UB_EV_READ    : 0 \
-	| ((b) & EV_WRITE  ) ? UB_EV_WRITE   : 0 \
-	| ((b) & EV_SIGNAL ) ? UB_EV_SIGNAL  : 0 \
-	| ((b) & EV_PERSIST) ? UB_EV_PERSIST : 0)
+	  (((b) & EV_TIMEOUT) ? UB_EV_TIMEOUT : 0) \
+	| (((b) & EV_READ   ) ? UB_EV_READ    : 0) \
+	| (((b) & EV_WRITE  ) ? UB_EV_WRITE   : 0) \
+	| (((b) & EV_SIGNAL ) ? UB_EV_SIGNAL  : 0) \
+	| (((b) & EV_PERSIST) ? UB_EV_PERSIST : 0))
 
 #  define UB_EV_BITS_CB(C) void my_ ## C (int fd, short bits, void *arg) \
 	{ (C)(fd, UB_EV_BITS(bits), arg); }
diff --git a/util/ub_event_pluggable.c b/util/ub_event_pluggable.c
index 2f662ecad..3ba1f2913 100644
--- a/util/ub_event_pluggable.c
+++ b/util/ub_event_pluggable.c
@@ -73,18 +73,18 @@
     UB_EV_PERSIST != EV_PERSIST
 /* Only necessary for libev */
 #  define NATIVE_BITS(b) ( \
-	  ((b) & UB_EV_TIMEOUT) ? EV_TIMEOUT : 0 \
-	| ((b) & UB_EV_READ   ) ? EV_READ    : 0 \
-	| ((b) & UB_EV_WRITE  ) ? EV_WRITE   : 0 \
-	| ((b) & UB_EV_SIGNAL ) ? EV_SIGNAL  : 0 \
-	| ((b) & UB_EV_PERSIST) ? EV_PERSIST : 0)
+	  (((b) & UB_EV_TIMEOUT) ? EV_TIMEOUT : 0) \
+	| (((b) & UB_EV_READ   ) ? EV_READ    : 0) \
+	| (((b) & UB_EV_WRITE  ) ? EV_WRITE   : 0) \
+	| (((b) & UB_EV_SIGNAL ) ? EV_SIGNAL  : 0) \
+	| (((b) & UB_EV_PERSIST) ? EV_PERSIST : 0))
 
 #  define UB_EV_BITS(b) ( \
-	  ((b) & EV_TIMEOUT) ? UB_EV_TIMEOUT : 0 \
-	| ((b) & EV_READ   ) ? UB_EV_READ    : 0 \
-	| ((b) & EV_WRITE  ) ? UB_EV_WRITE   : 0 \
-	| ((b) & EV_SIGNAL ) ? UB_EV_SIGNAL  : 0 \
-	| ((b) & EV_PERSIST) ? UB_EV_PERSIST : 0)
+	  (((b) & EV_TIMEOUT) ? UB_EV_TIMEOUT : 0) \
+	| (((b) & EV_READ   ) ? UB_EV_READ    : 0) \
+	| (((b) & EV_WRITE  ) ? UB_EV_WRITE   : 0) \
+	| (((b) & EV_SIGNAL ) ? UB_EV_SIGNAL  : 0) \
+	| (((b) & EV_PERSIST) ? UB_EV_PERSIST : 0))
 
 #  define UB_EV_BITS_CB(C) void my_ ## C (int fd, short bits, void *arg) \
 	{ (C)(fd, UB_EV_BITS(bits), arg); }