use () around & ops to clarify order precedence

git-svn-id: http://svn.openzap.org/svn/openzap/trunk@77 a93c3328-9c30-0410-af19-c9cd2b2d52af

diff --git a/libs/openzap/src/isdn/Q931ie.c b/libs/openzap/src/isdn/Q931ie.c
index 3bcf30623ec8058fbe10980551896f3aa276b84f..fe649f56a78b826b8682e127b821b7ae2a433e2c 100644 (file)
--- a/libs/openzap/src/isdn/Q931ie.c
+++ b/libs/openzap/src/isdn/Q931ie.c
@@ -453,7 +453,7 @@ L3INT Q931Uie_CallID(Q931_TrunkInfo *pTrunk, ie *pIE, L3UCHAR * IBuf, L3UCHAR *
         pie->CallId[x] = IBuf[Octet+Off] & 0x7f;\r
         Off++;\r
         x++;\r
-    }while(IBuf[Octet+Off]&0x80 != 0 && x < 10);\r
+    }while((IBuf[Octet+Off]&0x80) != 0 && x < 10);\r
 \r
     Q931IESizeTest(Q931E_CALLID);\r
 \r
@@ -622,7 +622,7 @@ L3INT Q931Uie_CalledSub(Q931_TrunkInfo *pTrunk, ie *pIE,L3UCHAR * IBuf, L3UCHAR
         pie->Digit[x] = IBuf[Octet+Off] & 0x7f;\r
         Off++;\r
         x++;\r
-    }while(IBuf[Octet+Off]&0x80 != 0 && x < 20);\r
+    }while((IBuf[Octet+Off]&0x80) != 0 && x < 20);\r
 \r
     Q931IESizeTest(Q931E_CALLEDSUB);\r
 \r
@@ -805,7 +805,7 @@ L3INT Q931Uie_CallingNum(Q931_TrunkInfo *pTrunk, ie *pIE, L3UCHAR * IBuf, L3UCHA
     pie->NumPlanID = IBuf[Octet+Off] & 0x0f;\r
     \r
     /* Octet 3a */\r
-    if(IBuf[Octet+Off] & 0x80 != 0)\r
+    if((IBuf[Octet+Off] & 0x80) != 0)\r
     {\r
         Off++;\r
         pie->PresInd = (IBuf[Octet+Off] >> 5) & 0x03;\r
@@ -819,7 +819,7 @@ L3INT Q931Uie_CallingNum(Q931_TrunkInfo *pTrunk, ie *pIE, L3UCHAR * IBuf, L3UCHA
         pie->Digit[x] = IBuf[Octet+Off] & 0x7f;\r
         Off++;\r
         x++;\r
-    }while(IBuf[Octet+Off]&0x80 != 0 && x < 20);\r
+    }while((IBuf[Octet+Off]&0x80) != 0 && x < 20);\r
 \r
     Q931IESizeTest(Q931E_CALLINGNUM);\r
 \r
@@ -925,7 +925,7 @@ L3INT Q931Uie_CallingSub(Q931_TrunkInfo *pTrunk, ie *pIE,L3UCHAR * IBuf, L3UCHAR
         pie->Digit[x] = IBuf[Octet+Off] & 0x7f;\r
         Off++;\r
         x++;\r
-    }while(IBuf[Octet+Off]&0x80 != 0 && x < 20);\r
+    }while((IBuf[Octet+Off]&0x80) != 0 && x < 20);\r
 \r
     Q931IESizeTest(Q931E_CALLINGSUB);\r
 \r
@@ -1013,7 +1013,7 @@ L3INT Q931Uie_Cause(Q931_TrunkInfo *pTrunk, ie *pIE, L3UCHAR * IBuf, L3UCHAR * O
     pie->Location = IBuf[Octet+Off] & 0x0f;\r
 \r
     /* Octet 3a */\r
-    if(IBuf[Octet+Off] & 0x80 != 0)\r
+    if((IBuf[Octet+Off] & 0x80) != 0)\r
     {\r
         Off++;\r
         pie->Recom = IBuf[Octet+Off] & 0x7f;\r
@@ -1764,7 +1764,7 @@ L3INT Q931Uie_LLComp(Q931_TrunkInfo *pTrunk, ie *pIE,L3UCHAR * IBuf, L3UCHAR * O
     Octet++;\r
 \r
     /* Octet 3a*/\r
-    if(IBuf[Octet+Off-1] & 0x80 != 0)\r
+    if((IBuf[Octet+Off-1] & 0x80) != 0)\r
     {\r
         pie->NegotInd = (IBuf[Octet+Off] >> 6) & 0x01;\r
         Off++;\r
@@ -1784,7 +1784,7 @@ L3INT Q931Uie_LLComp(Q931_TrunkInfo *pTrunk, ie *pIE,L3UCHAR * IBuf, L3UCHAR * O
     }\r
 \r
     /* Octet 5 - Layer 1 Ident */\r
-    if(IBuf[Octet+Off] & 0x60 == 0x20) /* Layer 1 Ident ? */\r
+    if((IBuf[Octet+Off] & 0x60) == 0x20) /* Layer 1 Ident ? */\r
     {\r
         pie->Layer1Ident = (IBuf[Octet+Off] >> 5) & 0x03;\r
         pie->UIL1Prot = IBuf[Octet+Off] & 0x1f;\r
@@ -1792,7 +1792,7 @@ L3INT Q931Uie_LLComp(Q931_TrunkInfo *pTrunk, ie *pIE,L3UCHAR * IBuf, L3UCHAR * O
         Octet++;\r
 \r
         /* Octet 5a */\r
-        if(IBuf[Octet+Off-1] & 0x80 != 0)\r
+        if((IBuf[Octet+Off-1] & 0x80) != 0)\r
         {\r
             pie->SyncAsync    = (IBuf[Octet+Off] >> 6) & 0x01;\r
             pie->Negot        = (IBuf[Octet+Off] >> 5) & 0x01;\r
@@ -1800,7 +1800,7 @@ L3INT Q931Uie_LLComp(Q931_TrunkInfo *pTrunk, ie *pIE,L3UCHAR * IBuf, L3UCHAR * O
             Off++;\r
 \r
             /* Octet 5b - 2 options */\r
-            if(IBuf[Octet+Off-1] & 0x80 != 0)\r
+            if((IBuf[Octet+Off-1] & 0x80) != 0)\r
             {\r
                 if(pie->UIL1Prot == 0x01) /* V.110, I.460 and X.30*/\r
                 {\r
@@ -1833,7 +1833,7 @@ L3INT Q931Uie_LLComp(Q931_TrunkInfo *pTrunk, ie *pIE,L3UCHAR * IBuf, L3UCHAR * O
                 }\r
 \r
                 /* Octet 5c */\r
-                if(IBuf[Octet+Off-1] & 0x80 != 0)\r
+                if((IBuf[Octet+Off-1] & 0x80) != 0)\r
                 {\r
                     pie->NumStopBits=(IBuf[Octet+Off] >> 5) & 0x03;\r
                     pie->NumDataBits=(IBuf[Octet+Off] >> 3) & 0x03;\r
@@ -1841,7 +1841,7 @@ L3INT Q931Uie_LLComp(Q931_TrunkInfo *pTrunk, ie *pIE,L3UCHAR * IBuf, L3UCHAR * O
                     Off++;\r
 \r
                     /* Octet 5d */\r
-                    if(IBuf[Octet+Off-1] & 0x80 != 0)\r
+                    if((IBuf[Octet+Off-1] & 0x80) != 0)\r
                     {\r
                         pie->DuplexMode    = (IBuf[Octet+Off] >> 6) & 0x01;\r
                         pie->ModemType    = IBuf[Octet+Off] & 0x3f;\r
@@ -1854,14 +1854,14 @@ L3INT Q931Uie_LLComp(Q931_TrunkInfo *pTrunk, ie *pIE,L3UCHAR * IBuf, L3UCHAR * O
     }\r
 \r
     /* Octet 6 - Layer 2 Ident */\r
-    if(IBuf[Octet+Off] & 0x60 == 0x40) /* Layer 1 Ident ? */\r
+    if((IBuf[Octet+Off] & 0x60) == 0x40) /* Layer 1 Ident ? */\r
     {\r
         pie->Layer2Ident= (IBuf[Octet+Off] >>5) & 0x03;\r
         pie->UIL2Prot    = IBuf[Octet+Off] & 0x1f;\r
         Octet++;\r
 \r
         /* Octet 6a */\r
-        if(IBuf[Octet+Off-1] & 0x80 != 0)\r
+        if((IBuf[Octet+Off-1] & 0x80) != 0)\r
         {\r
             if(pie->UIL2Prot == 0x10) /* 2nd 6a */\r
             {\r
@@ -1875,7 +1875,7 @@ L3INT Q931Uie_LLComp(Q931_TrunkInfo *pTrunk, ie *pIE,L3UCHAR * IBuf, L3UCHAR * O
                 Off++;\r
             }\r
             /* Octet 6b*/\r
-            if(IBuf[Octet+Off-1] & 0x80 != 0)\r
+            if((IBuf[Octet+Off-1] & 0x80) != 0)\r
             {\r
                 pie->WindowSize = IBuf[Octet+Off] & 0x7f;\r
                 Off++;\r
@@ -1884,14 +1884,14 @@ L3INT Q931Uie_LLComp(Q931_TrunkInfo *pTrunk, ie *pIE,L3UCHAR * IBuf, L3UCHAR * O
     }\r
 \r
     /* Octet 7 - layer 3 Ident */\r
-    if(IBuf[Octet+Off] & 0x60 == 0x60) /* Layer 3 Ident ? */\r
+    if((IBuf[Octet+Off] & 0x60) == 0x60) /* Layer 3 Ident ? */\r
     {\r
         pie->Layer3Ident= (IBuf[Octet+Off] >> 5) & 0x03;\r
         pie->UIL3Prot    = IBuf[Octet+Off] & 0x1f;\r
         Octet++;\r
 \r
         /* Octet 7a */\r
-        if(IBuf[Octet+Off-1] & 0x80 != 0)\r
+        if((IBuf[Octet+Off-1] & 0x80) != 0)\r
         {\r
         \r
             if(pie->UIL3Prot == 0x0b)\r
@@ -1915,13 +1915,13 @@ L3INT Q931Uie_LLComp(Q931_TrunkInfo *pTrunk, ie *pIE,L3UCHAR * IBuf, L3UCHAR * O
                 }\r
 \r
                 /* Octet 7b*/\r
-                if(IBuf[Octet+Off-1] & 0x80 != 0)\r
+                if((IBuf[Octet+Off-1] & 0x80) != 0)\r
                 {\r
                     pie->DefPackSize = IBuf[Octet+Off] & 0x0f;\r
                     Off++;\r
 \r
                     /* Octet 7c */\r
-                    if(IBuf[Octet+Off-1] & 0x80 != 0)\r
+                    if((IBuf[Octet+Off-1] & 0x80) != 0)\r
                     {\r
                         pie->PackWinSize= IBuf[Octet+Off] & 0x7f;\r
                     }\r

diff --git a/libs/openzap/src/isdn/include/Q931.h b/libs/openzap/src/isdn/include/Q931.h
index 663d18d2da7268707f27d84a6bfbeae92c828b4c..79f5ac9f000cd52efc8cf9076ba9de4806186334 100644 (file)
--- a/libs/openzap/src/isdn/include/Q931.h
+++ b/libs/openzap/src/isdn/include/Q931.h
@@ -115,9 +115,8 @@
 #ifdef _MSC_VER\r
 /* warning C4244: conversion from 'type a' to 'type b', possible loss of data  TODO:  This one should not be disabled */\r
 /* warning C4189 : local variable is initialized but not referenced  TODO:  This one should not be disabled */\r
-/* warning C4554: '&' : check operator precedence for possible error; use parentheses to clarify precedence TODO:  This one should not be disabled */\r
 /* warning C4267: '=' : conversion from 'size_t' to 'unsigned char', possible loss of data TODO:  This one should not be disabled */\r
-#pragma warning(disable:4100 4244 4189 4554 4267)\r
+#pragma warning(disable:4100 4244 4189 4267)\r
 #endif\r
 \r
 /*****************************************************************************\r