[tfaber] 69652: [NETWORKING][CABMAN] - Attempt to silence some 200 benign "Operands don't affect result" Coverity defects
Author: tfaber Date: Fri Oct 23 07:26:42 2015 New Revision: 69652
URL: http://svn.reactos.org/svn/reactos?rev=69652&view=rev Log: [NETWORKING][CABMAN] - Attempt to silence some 200 benign "Operands don't affect result" Coverity defects
Modified: trunk/reactos/dll/win32/ws2_32/include/debug.h trunk/reactos/dll/win32/wshirda/debug.h trunk/reactos/drivers/network/afd/include/debug.h trunk/reactos/drivers/network/dd/ne2000/include/debug.h trunk/reactos/drivers/network/dd/rtl8139/debug.h trunk/reactos/drivers/network/lan/include/debug.h trunk/reactos/drivers/network/ndis/include/debug.h trunk/reactos/tools/cabman/cabinet.h trunk/rosapps/applications/net/tditest/include/debug.h
Modified: trunk/reactos/dll/win32/ws2_32/include/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/include/de... ============================================================================== --- trunk/reactos/dll/win32/ws2_32/include/debug.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/include/debug.h [iso-8859-1] Fri Oct 23 07:26:42 2015 @@ -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_; \ }
Modified: trunk/reactos/dll/win32/wshirda/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wshirda/debug.h?r... ============================================================================== --- trunk/reactos/dll/win32/wshirda/debug.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wshirda/debug.h [iso-8859-1] Fri Oct 23 07:26:42 2015 @@ -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_; \ }
Modified: trunk/reactos/drivers/network/afd/include/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/include... ============================================================================== --- trunk/reactos/drivers/network/afd/include/debug.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/include/debug.h [iso-8859-1] Fri Oct 23 07:26:42 2015 @@ -26,8 +26,9 @@ #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 @@ #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_ ; \ }
Modified: trunk/reactos/drivers/network/dd/ne2000/include/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/dd/ne2000/i... ============================================================================== --- trunk/reactos/drivers/network/dd/ne2000/include/debug.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/dd/ne2000/include/debug.h [iso-8859-1] Fri Oct 23 07:26:42 2015 @@ -25,8 +25,9 @@ #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 @@ #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_ ; \ }
Modified: trunk/reactos/drivers/network/dd/rtl8139/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/dd/rtl8139/... ============================================================================== --- trunk/reactos/drivers/network/dd/rtl8139/debug.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/dd/rtl8139/debug.h [iso-8859-1] Fri Oct 23 07:26:42 2015 @@ -25,8 +25,9 @@ #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 @@ #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_ ; \ }
Modified: trunk/reactos/drivers/network/lan/include/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/lan/include... ============================================================================== --- trunk/reactos/drivers/network/lan/include/debug.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/lan/include/debug.h [iso-8859-1] Fri Oct 23 07:26:42 2015 @@ -40,8 +40,9 @@ #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 @@ #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_ ; \ }
Modified: trunk/reactos/drivers/network/ndis/include/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/includ... ============================================================================== --- trunk/reactos/drivers/network/ndis/include/debug.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/include/debug.h [iso-8859-1] Fri Oct 23 07:26:42 2015 @@ -26,8 +26,9 @@ #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 @@ #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_ ; \ }
Modified: trunk/reactos/tools/cabman/cabinet.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/cabinet.h?rev=... ============================================================================== --- trunk/reactos/tools/cabman/cabinet.h [iso-8859-1] (original) +++ trunk/reactos/tools/cabman/cabinet.h [iso-8859-1] Fri Oct 23 07:26:42 2015 @@ -65,8 +65,9 @@
#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_ ; \ }
Modified: trunk/rosapps/applications/net/tditest/include/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/net/tditest/in... ============================================================================== --- trunk/rosapps/applications/net/tditest/include/debug.h [iso-8859-1] (original) +++ trunk/rosapps/applications/net/tditest/include/debug.h [iso-8859-1] Fri Oct 23 07:26:42 2015 @@ -28,8 +28,9 @@ #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 @@ #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_ ; \ }
-
tfaber＠svn.reactos.org