From 9b00fd4ea8e15cf7a1ade5ac60bb4ed82cc15a0c Mon Sep 17 00:00:00 2001 From: Thomas Faber Date: Fri, 23 Oct 2015 07:26:42 +0000 Subject: [PATCH] [NETWORKING][CABMAN] - Attempt to silence some 200 benign "Operands don't affect result" Coverity defects svn path=/trunk/; revision=69652 --- reactos/dll/win32/ws2_32/include/debug.h | 5 +++-- reactos/dll/win32/wshirda/debug.h | 5 +++-- reactos/drivers/network/afd/include/debug.h | 10 ++++++---- reactos/drivers/network/dd/ne2000/include/debug.h | 10 ++++++---- reactos/drivers/network/dd/rtl8139/debug.h | 10 ++++++---- reactos/drivers/network/lan/include/debug.h | 10 ++++++---- reactos/drivers/network/ndis/include/debug.h | 10 ++++++---- reactos/tools/cabman/cabinet.h | 5 +++-- rosapps/applications/net/tditest/include/debug.h | 10 ++++++---- 9 files changed, 45 insertions(+), 30 deletions(-) diff --git a/reactos/dll/win32/ws2_32/include/debug.h b/reactos/dll/win32/ws2_32/include/debug.h index aa6d9704fac..22cfd39c7ae 100644 --- a/reactos/dll/win32/ws2_32/include/debug.h +++ b/reactos/dll/win32/ws2_32/include/debug.h @@ -28,8 +28,9 @@ extern DWORD DebugTraceLevel; #define WS_DbgPrint(_t_, _x_) \ - if (((DebugTraceLevel & NORMAL_MASK) >= _t_) || \ - ((DebugTraceLevel & _t_) > NORMAL_MASK)) { \ + if ((_t_ > NORMAL_MASK) \ + ? (DebugTraceLevel & _t_) > NORMAL_MASK \ + : (DebugTraceLevel & NORMAL_MASK) >= _t_) { \ DbgPrint("(%hS:%d)(%hS) ", __FILE__, __LINE__, __FUNCTION__); \ DbgPrint _x_; \ } diff --git a/reactos/dll/win32/wshirda/debug.h b/reactos/dll/win32/wshirda/debug.h index c8702f3e6b0..ebdca62f698 100644 --- a/reactos/dll/win32/wshirda/debug.h +++ b/reactos/dll/win32/wshirda/debug.h @@ -22,8 +22,9 @@ extern DWORD DebugTraceLevel; #define WSH_DbgPrint(_t_, _x_) \ - if (((DebugTraceLevel & NORMAL_MASK) >= _t_) || \ - ((DebugTraceLevel & _t_) > NORMAL_MASK)) { \ + if ((_t_ > NORMAL_MASK) \ + ? (DebugTraceLevel & _t_) > NORMAL_MASK \ + : (DebugTraceLevel & NORMAL_MASK) >= _t_) { \ DbgPrint("(%hS:%d)(%hS) ", __FILE__, __LINE__, __FUNCTION__); \ DbgPrint _x_; \ } diff --git a/reactos/drivers/network/afd/include/debug.h b/reactos/drivers/network/afd/include/debug.h index f4ed29a3955..15377d00e29 100644 --- a/reactos/drivers/network/afd/include/debug.h +++ b/reactos/drivers/network/afd/include/debug.h @@ -26,8 +26,9 @@ extern DWORD DebugTraceLevel; #ifdef _MSC_VER #define AFD_DbgPrint(_t_, _x_) \ - if (((DebugTraceLevel & NORMAL_MASK) >= _t_) || \ - ((DebugTraceLevel & _t_) > NORMAL_MASK)) { \ + if ((_t_ > NORMAL_MASK) \ + ? (DebugTraceLevel & _t_) > NORMAL_MASK \ + : (DebugTraceLevel & NORMAL_MASK) >= _t_) { \ DbgPrint("(%s:%d) ", __FILE__, __LINE__); \ DbgPrint _x_ ; \ } @@ -35,8 +36,9 @@ extern DWORD DebugTraceLevel; #else /* _MSC_VER */ #define AFD_DbgPrint(_t_, _x_) \ - if (((DebugTraceLevel & NORMAL_MASK) >= _t_) || \ - ((DebugTraceLevel & _t_) > NORMAL_MASK)) { \ + if ((_t_ > NORMAL_MASK) \ + ? (DebugTraceLevel & _t_) > NORMAL_MASK \ + : (DebugTraceLevel & NORMAL_MASK) >= _t_) { \ DbgPrint("(%s:%d)(%s) ", __FILE__, __LINE__, __FUNCTION__); \ DbgPrint _x_ ; \ } diff --git a/reactos/drivers/network/dd/ne2000/include/debug.h b/reactos/drivers/network/dd/ne2000/include/debug.h index f495766a059..73e718929c4 100644 --- a/reactos/drivers/network/dd/ne2000/include/debug.h +++ b/reactos/drivers/network/dd/ne2000/include/debug.h @@ -25,8 +25,9 @@ extern ULONG DebugTraceLevel; #ifdef _MSC_VER #define NDIS_DbgPrint(_t_, _x_) \ - if (((DebugTraceLevel & NORMAL_MASK) >= _t_) || \ - ((DebugTraceLevel & _t_) > NORMAL_MASK)) { \ + if ((_t_ > NORMAL_MASK) \ + ? (DebugTraceLevel & _t_) > NORMAL_MASK \ + : (DebugTraceLevel & NORMAL_MASK) >= _t_) { \ DbgPrint("(%s:%d) ", __FILE__, __LINE__); \ DbgPrint _x_ ; \ } @@ -34,8 +35,9 @@ extern ULONG DebugTraceLevel; #else /* _MSC_VER */ #define NDIS_DbgPrint(_t_, _x_) \ - if (((DebugTraceLevel & NORMAL_MASK) >= _t_) || \ - ((DebugTraceLevel & _t_) > NORMAL_MASK)) { \ + if ((_t_ > NORMAL_MASK) \ + ? (DebugTraceLevel & _t_) > NORMAL_MASK \ + : (DebugTraceLevel & NORMAL_MASK) >= _t_) { \ DbgPrint("(%s:%d)(%s) ", __FILE__, __LINE__, __FUNCTION__); \ DbgPrint _x_ ; \ } diff --git a/reactos/drivers/network/dd/rtl8139/debug.h b/reactos/drivers/network/dd/rtl8139/debug.h index f495766a059..73e718929c4 100644 --- a/reactos/drivers/network/dd/rtl8139/debug.h +++ b/reactos/drivers/network/dd/rtl8139/debug.h @@ -25,8 +25,9 @@ extern ULONG DebugTraceLevel; #ifdef _MSC_VER #define NDIS_DbgPrint(_t_, _x_) \ - if (((DebugTraceLevel & NORMAL_MASK) >= _t_) || \ - ((DebugTraceLevel & _t_) > NORMAL_MASK)) { \ + if ((_t_ > NORMAL_MASK) \ + ? (DebugTraceLevel & _t_) > NORMAL_MASK \ + : (DebugTraceLevel & NORMAL_MASK) >= _t_) { \ DbgPrint("(%s:%d) ", __FILE__, __LINE__); \ DbgPrint _x_ ; \ } @@ -34,8 +35,9 @@ extern ULONG DebugTraceLevel; #else /* _MSC_VER */ #define NDIS_DbgPrint(_t_, _x_) \ - if (((DebugTraceLevel & NORMAL_MASK) >= _t_) || \ - ((DebugTraceLevel & _t_) > NORMAL_MASK)) { \ + if ((_t_ > NORMAL_MASK) \ + ? (DebugTraceLevel & _t_) > NORMAL_MASK \ + : (DebugTraceLevel & NORMAL_MASK) >= _t_) { \ DbgPrint("(%s:%d)(%s) ", __FILE__, __LINE__, __FUNCTION__); \ DbgPrint _x_ ; \ } diff --git a/reactos/drivers/network/lan/include/debug.h b/reactos/drivers/network/lan/include/debug.h index fc72311e088..5147292921e 100644 --- a/reactos/drivers/network/lan/include/debug.h +++ b/reactos/drivers/network/lan/include/debug.h @@ -40,8 +40,9 @@ extern DWORD DebugTraceLevel; #ifdef _MSC_VER #define LA_DbgPrint(_t_, _x_) \ - if (((DebugTraceLevel & NORMAL_MASK) >= _t_) || \ - ((DebugTraceLevel & _t_) > NORMAL_MASK)) { \ + if ((_t_ > NORMAL_MASK) \ + ? (DebugTraceLevel & _t_) > NORMAL_MASK \ + : (DebugTraceLevel & NORMAL_MASK) >= _t_) { \ DbgPrint("(%s:%d) ", __FILE__, __LINE__); \ DbgPrint _x_ ; \ } @@ -49,8 +50,9 @@ extern DWORD DebugTraceLevel; #else /* _MSC_VER */ #define LA_DbgPrint(_t_, _x_) \ - if (((DebugTraceLevel & NORMAL_MASK) >= _t_) || \ - ((DebugTraceLevel & _t_) > NORMAL_MASK)) { \ + if ((_t_ > NORMAL_MASK) \ + ? (DebugTraceLevel & _t_) > NORMAL_MASK \ + : (DebugTraceLevel & NORMAL_MASK) >= _t_) { \ DbgPrint("(%s:%d)(%s) ", __FILE__, __LINE__, __FUNCTION__); \ DbgPrint _x_ ; \ } diff --git a/reactos/drivers/network/ndis/include/debug.h b/reactos/drivers/network/ndis/include/debug.h index 32cf70f78e0..678d9bda6d3 100644 --- a/reactos/drivers/network/ndis/include/debug.h +++ b/reactos/drivers/network/ndis/include/debug.h @@ -26,8 +26,9 @@ extern ULONG DebugTraceLevel; #ifdef _MSC_VER #define NDIS_DbgPrint(_t_, _x_) \ - if (((DebugTraceLevel & NORMAL_MASK) >= _t_) || \ - ((DebugTraceLevel & _t_) > NORMAL_MASK)) { \ + if ((_t_ > NORMAL_MASK) \ + ? (DebugTraceLevel & _t_) > NORMAL_MASK \ + : (DebugTraceLevel & NORMAL_MASK) >= _t_) { \ DbgPrint("(%s:%d) ", __FILE__, __LINE__); \ DbgPrint _x_ ; \ } @@ -35,8 +36,9 @@ extern ULONG DebugTraceLevel; #else /* _MSC_VER */ #define NDIS_DbgPrint(_t_, _x_) \ - if (((DebugTraceLevel & NORMAL_MASK) >= _t_) || \ - ((DebugTraceLevel & _t_) > NORMAL_MASK)) { \ + if ((_t_ > NORMAL_MASK) \ + ? (DebugTraceLevel & _t_) > NORMAL_MASK \ + : (DebugTraceLevel & NORMAL_MASK) >= _t_) { \ DbgPrint("(%s:%d)(%s) ", __FILE__, __LINE__, __FUNCTION__); \ DbgPrint _x_ ; \ } diff --git a/reactos/tools/cabman/cabinet.h b/reactos/tools/cabman/cabinet.h index 4794d5e78f1..1a2df3e1d5c 100644 --- a/reactos/tools/cabman/cabinet.h +++ b/reactos/tools/cabman/cabinet.h @@ -65,8 +65,9 @@ extern ULONG DebugTraceLevel; #undef DPRINT #define DPRINT(_t_, _x_) \ - if (((DebugTraceLevel & NORMAL_MASK) >= _t_) || \ - ((DebugTraceLevel & _t_) > NORMAL_MASK)) { \ + if ((_t_ > NORMAL_MASK) \ + ? (DebugTraceLevel & _t_) > NORMAL_MASK \ + : (DebugTraceLevel & NORMAL_MASK) >= _t_) { \ printf("(%s:%d)(%s) ", __FILE__, __LINE__, __FUNCTION__); \ printf _x_ ; \ } diff --git a/rosapps/applications/net/tditest/include/debug.h b/rosapps/applications/net/tditest/include/debug.h index 349b521b962..f4eb3b1507a 100644 --- a/rosapps/applications/net/tditest/include/debug.h +++ b/rosapps/applications/net/tditest/include/debug.h @@ -28,8 +28,9 @@ extern ULONG DebugTraceLevel; #ifdef _MSC_VER #define TDI_DbgPrint(_t_, _x_) \ - if (((DebugTraceLevel & NORMAL_MASK) >= _t_) || \ - ((DebugTraceLevel & _t_) > NORMAL_MASK)) { \ + if ((_t_ > NORMAL_MASK) \ + ? (DebugTraceLevel & _t_) > NORMAL_MASK \ + : (DebugTraceLevel & NORMAL_MASK) >= _t_) { \ DbgPrint("(%s:%d) ", __FILE__, __LINE__); \ DbgPrint _x_ ; \ } @@ -37,8 +38,9 @@ extern ULONG DebugTraceLevel; #else /* _MSC_VER */ #define TDI_DbgPrint(_t_, _x_) \ - if (((DebugTraceLevel & NORMAL_MASK) >= _t_) || \ - ((DebugTraceLevel & _t_) > NORMAL_MASK)) { \ + if ((_t_ > NORMAL_MASK) \ + ? (DebugTraceLevel & _t_) > NORMAL_MASK \ + : (DebugTraceLevel & NORMAL_MASK) >= _t_) { \ DbgPrint("(%s:%d)(%s) ", __FILE__, __LINE__, __FUNCTION__); \ DbgPrint _x_ ; \ }