From d41a3f0e64e276ed37c3d3b63148d78a78377d45 Mon Sep 17 00:00:00 2001 From: Thomas Faber Date: Mon, 30 Jan 2017 13:43:21 +0000 Subject: [PATCH 1/1] [DHCPCSVC] - Addendum to r69652: Avoid some more "Operands don't affect result" warnings. CID 515151, 515152, 515153 svn path=/trunk/; revision=73635 --- reactos/base/services/dhcpcsvc/include/debug.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/reactos/base/services/dhcpcsvc/include/debug.h b/reactos/base/services/dhcpcsvc/include/debug.h index de374aaba45..663725cd0cd 100644 --- a/reactos/base/services/dhcpcsvc/include/debug.h +++ b/reactos/base/services/dhcpcsvc/include/debug.h @@ -25,8 +25,9 @@ extern unsigned long debug_trace_level; #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 @@ extern unsigned long debug_trace_level; #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_ ; \ } -- 2.17.1