[ros-diffs] [tfaber] 73635: [DHCPCSVC] - Addendum to r69652: Avoid some more "Operands don't affect result" warnings. CID 515151, 515152, 515153

Author: tfaber
Date: Mon Jan 30 13:43:21 2017
New Revision: 73635

URL: http://svn.reactos.org/svn/reactos?rev=73635&view=rev
Log:
[DHCPCSVC]
- Addendum to r69652: Avoid some more "Operands don't affect result" warnings. CID 515151, 515152, 515153

Modified:
    trunk/reactos/base/services/dhcpcsvc/include/debug.h

Modified: trunk/reactos/base/services/dhcpcsvc/include/debug.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/dhcpcsvc/incl...
==============================================================================
--- trunk/reactos/base/services/dhcpcsvc/include/debug.h	[iso-8859-1] (original)
+++ trunk/reactos/base/services/dhcpcsvc/include/debug.h	[iso-8859-1] Mon Jan 30 13:43:21 2017
@@ -25,8 +25,9 @@
 #ifdef _MSC_VER

#define DH_DbgPrint(_t_, _x_) \
-    if (((debug_trace_level & NORMAL_MASK) >= _t_) || \
-        ((debug_trace_level & _t_) > NORMAL_MASK)) { \
+    if ((_t_ > NORMAL_MASK) \
+        ? (debug_trace_level & _t_) > NORMAL_MASK \
+        : (debug_trace_level & NORMAL_MASK) >= _t_) { \
         DbgPrint("(%s:%d) ", __FILE__, __LINE__); \
         DbgPrint _x_ ; \
     }
@@ -34,8 +35,9 @@
 #else /* _MSC_VER */

#define DH_DbgPrint(_t_, _x_) \
-    if (((debug_trace_level & NORMAL_MASK) >= _t_) || \
-        ((debug_trace_level & _t_) > NORMAL_MASK)) { \
+    if ((_t_ > NORMAL_MASK) \
+        ? (debug_trace_level & _t_) > NORMAL_MASK \
+        : (debug_trace_level & NORMAL_MASK) >= _t_) { \
         DbgPrint("(%s:%d)(%s) ", __FILE__, __LINE__, __FUNCTION__); \
         DbgPrint _x_ ; \
     }