From: Guilherme Maciel Ferreira <guilherme.maciel.ferreira@gmail.com>
Date: Sun, 4 Sep 2011 12:20:16 +0000 (-0300)
Subject: Solved operator precedence mismatch reported by PC-lint, where the '|' has higher... 
X-Git-Tag: v1.2~60
X-Git-Url: http://developer.intra2net.com/git/?a=commitdiff_plain;h=0ff49041a94ed388404ddb79f0149d716fff11ba;p=pingcheck

Solved operator precedence mismatch reported by PC-lint, where the '|' has higher precedence than ternary '?:'
- Warning 514: Unusual use of a Boolean expression
---

diff --git a/src/tcp/tcpheader.cpp b/src/tcp/tcpheader.cpp
index 13b23a9..094bc1e 100644
--- a/src/tcp/tcpheader.cpp
+++ b/src/tcp/tcpheader.cpp
@@ -189,42 +189,50 @@ void TcpHeader::set_header_length( const uint8_t offset )
 
 void TcpHeader::set_congestion_window_reduced( bool bit )
 {
-    Payload[13] = Payload[13] | bit ? 0x80 : 0x0;
+    uint8_t bit_mask = bit ? 0x80 : 0x00;
+    Payload[13] = Payload[13] | bit_mask;
 }
 
 void TcpHeader::set_ecn_echo( bool bit )
 {
-    Payload[13] = Payload[13] | bit ? 0x40 : 0x0;
+    uint8_t bit_mask = bit ? 0x40 : 0x00 ;
+    Payload[13] = Payload[13] | bit_mask;
 }
 
 void TcpHeader::set_urgent( bool bit )
 {
-    Payload[13] = Payload[13] | bit ? 0x20 : 0x0;
+    uint8_t bit_mask = bit ? 0x20 : 0x00 ;
+    Payload[13] = Payload[13] | bit_mask;
 }
 
 void TcpHeader::set_acknowledgment( bool bit )
 {
-    Payload[13] = Payload[13] | bit ? 0x10 : 0x0;
+    uint8_t bit_mask = bit ? 0x10 : 0x00 ;
+    Payload[13] = Payload[13] | bit_mask;
 }
 
 void TcpHeader::set_push( bool bit )
 {
-    Payload[13] = Payload[13] | bit ? 0x08 : 0x0;
+    uint8_t bit_mask = bit ? 0x08 : 0x00 ;
+    Payload[13] = Payload[13] | bit_mask;
 }
 
 void TcpHeader::set_reset( bool bit )
 {
-    Payload[13] = Payload[13] | bit ? 0x04 : 0x0;
+    uint8_t bit_mask = bit ? 0x04 : 0x00 ;
+    Payload[13] = Payload[13] | bit_mask;
 }
 
 void TcpHeader::set_synchronize( bool bit )
 {
-    Payload[13] = Payload[13] | bit ? 0x02 : 0x0;
+    uint8_t bit_mask = bit ? 0x02 : 0x00 ;
+    Payload[13] = Payload[13] | bit_mask;
 }
 
 void TcpHeader::set_finish( bool bit )
 {
-    Payload[13] = Payload[13] | bit ? 0x01 : 0x0;
+    uint8_t bit_mask = bit ? 0x01 : 0x00 ;
+    Payload[13] = Payload[13] | bit_mask;
 }
 
 void TcpHeader::set_window_size( const uint16_t wnd_size )