linux: fix NumberUtilities_strtod warnings

Jianchun Xu · Jianchun Xu · commit ca74226f8ece · 2016-02-29T09:45:06.000-08:00
Add parenthesises to &amp;&amp; between ||
diff --git a/lib/Common/Common/NumberUtilities_strtod.cpp b/lib/Common/Common/NumberUtilities_strtod.cpp
@@ -57,7 +57,7 @@ struct BIGNUM
     void Round(ulong luExtra)
     {
         if (0 == (luExtra & 0x80000000) ||
-            0 == (luExtra & 0x7FFFFFFF) && 0 == (m_lu0 & 1))
+            (0 == (luExtra & 0x7FFFFFFF) && 0 == (m_lu0 & 1)))
         {
             if (luExtra)
                 m_luError++;
@@ -856,7 +856,7 @@ static double AdjustDbl(double dbl, const EncodedChar *prgch, long cch, long lwE
             goto LFail;
 
         wT = biDbl.Compare(&biDec);
-        if (wT > 0 || 0 == wT && 0 != (Js::NumberUtilities::LuLoDbl(dbl) & 1))
+        if (wT > 0 || (0 == wT && 0 != (Js::NumberUtilities::LuLoDbl(dbl) & 1)))
         {
             // Return the next lower value.
             if (!Js::NumberUtilities::AddLu(&Js::NumberUtilities::LuLoDbl(dbl), 0xFFFFFFFF))
@@ -876,7 +876,7 @@ static double AdjustDbl(double dbl, const EncodedChar *prgch, long cch, long lwE
             goto LFail;
 
         wT = biDbl.Compare(&biDec);
-        if (wT < 0 || 0 == wT && 0 != (Js::NumberUtilities::LuLoDbl(dbl) & 1))
+        if (wT < 0 || (0 == wT && 0 != (Js::NumberUtilities::LuLoDbl(dbl) & 1)))
         {
             // Return the next higher value.
             if (Js::NumberUtilities::AddLu(&Js::NumberUtilities::LuLoDbl(dbl), 1))
@@ -1492,7 +1492,7 @@ static BOOL FDblToRgbPrecise(double dbl, __out_ecount(kcbMaxRgb) byte *prgb, int
         }
 
         // if (biNum < *pbiLo || biNum == *pbiLo && even)
-        if (w1 < 0 || 0 == w1 && 0 == (Js::NumberUtilities::LuLoDbl(dbl) & 1))
+        if (w1 < 0 || (0 == w1 && 0 == (Js::NumberUtilities::LuLoDbl(dbl) & 1)))
         {
             // if (biNum + biHi > biDen)
             if (w2 > 0)
@@ -1501,7 +1501,7 @@ static BOOL FDblToRgbPrecise(double dbl, __out_ecount(kcbMaxRgb) byte *prgb, int
                 if (!biNum.FShiftLeft(1))
                     goto LFail;
                 w2 = biNum.Compare(&biDen);
-                if ((w2 > 0 || w2 == 0 && (bT & 1)) && bT++ == 9)
+                if ((w2 > 0 || (w2 == 0 && (bT & 1))) && bT++ == 9)
                     goto LRoundUp9;
             }
             Assert(ib < kcbMaxRgb);

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ struct BIGNUM`
`57`	`57`	`void Round(ulong luExtra)`
`58`	`58`	`{`
`59`	`59`	`if (0 == (luExtra & 0x80000000) \|\|`
`60`		`- 0 == (luExtra & 0x7FFFFFFF) && 0 == (m_lu0 & 1))`
	`60`	`+ (0 == (luExtra & 0x7FFFFFFF) && 0 == (m_lu0 & 1)))`
`61`	`61`	`{`
`62`	`62`	`if (luExtra)`
`63`	`63`	`m_luError++;`
`@@ -856,7 +856,7 @@ static double AdjustDbl(double dbl, const EncodedChar *prgch, long cch, long lwE`
`856`	`856`	`goto LFail;`
`857`	`857`
`858`	`858`	`wT = biDbl.Compare(&biDec);`
`859`		`- if (wT > 0 \|\| 0 == wT && 0 != (Js::NumberUtilities::LuLoDbl(dbl) & 1))`
	`859`	`+ if (wT > 0 \|\| (0 == wT && 0 != (Js::NumberUtilities::LuLoDbl(dbl) & 1)))`
`860`	`860`	`{`
`861`	`861`	`// Return the next lower value.`
`862`	`862`	`if (!Js::NumberUtilities::AddLu(&Js::NumberUtilities::LuLoDbl(dbl), 0xFFFFFFFF))`
`@@ -876,7 +876,7 @@ static double AdjustDbl(double dbl, const EncodedChar *prgch, long cch, long lwE`
`876`	`876`	`goto LFail;`
`877`	`877`
`878`	`878`	`wT = biDbl.Compare(&biDec);`
`879`		`- if (wT < 0 \|\| 0 == wT && 0 != (Js::NumberUtilities::LuLoDbl(dbl) & 1))`
	`879`	`+ if (wT < 0 \|\| (0 == wT && 0 != (Js::NumberUtilities::LuLoDbl(dbl) & 1)))`
`880`	`880`	`{`
`881`	`881`	`// Return the next higher value.`
`882`	`882`	`if (Js::NumberUtilities::AddLu(&Js::NumberUtilities::LuLoDbl(dbl), 1))`
`@@ -1492,7 +1492,7 @@ static BOOL FDblToRgbPrecise(double dbl, __out_ecount(kcbMaxRgb) byte *prgb, int`
`1492`	`1492`	`}`
`1493`	`1493`
`1494`	`1494`	`// if (biNum < pbiLo \|\| biNum == pbiLo && even)`
`1495`		`- if (w1 < 0 \|\| 0 == w1 && 0 == (Js::NumberUtilities::LuLoDbl(dbl) & 1))`
	`1495`	`+ if (w1 < 0 \|\| (0 == w1 && 0 == (Js::NumberUtilities::LuLoDbl(dbl) & 1)))`
`1496`	`1496`	`{`
`1497`	`1497`	`// if (biNum + biHi > biDen)`
`1498`	`1498`	`if (w2 > 0)`
`@@ -1501,7 +1501,7 @@ static BOOL FDblToRgbPrecise(double dbl, __out_ecount(kcbMaxRgb) byte *prgb, int`
`1501`	`1501`	`if (!biNum.FShiftLeft(1))`
`1502`	`1502`	`goto LFail;`
`1503`	`1503`	`w2 = biNum.Compare(&biDen);`
`1504`		`- if ((w2 > 0 \|\| w2 == 0 && (bT & 1)) && bT++ == 9)`
	`1504`	`+ if ((w2 > 0 \|\| (w2 == 0 && (bT & 1))) && bT++ == 9)`
`1505`	`1505`	`goto LRoundUp9;`
`1506`	`1506`	`}`
`1507`	`1507`	`Assert(ib < kcbMaxRgb);`