Skip to content

W
wine-winehq
Commit 5b80d1be authored by Marcus Meissner's avatar Marcus Meissner Committed by Alexandre Julliard
Browse files
Options

oleaut32: Unshadow cmp to make code work (Coverity).

parent 7ccbbd86
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
dlls/oleaut32/vartype.c
View file @ 5b80d1be
...@@ -4562,6 +4562,7 @@ HRESULT WINAPI VarDecAdd(const DECIMAL* pDecLeft, const DECIMAL* pDecRight, DECI ...@@ -4562,6 +4562,7 @@ HRESULT WINAPI VarDecAdd(const DECIMAL* pDecLeft, const DECIMAL* pDecRight, DECI
/* Our decimals now have the same scale, we can add them as 96 bit integers */ /* Our decimals now have the same scale, we can add them as 96 bit integers */
ULONG overflow = 0; ULONG overflow = 0;
BYTE sign = DECIMAL_POS; BYTE sign = DECIMAL_POS;
int cmp;
/* Correct for the sign of the result */ /* Correct for the sign of the result */
if (DEC_SIGN(pDecLeft) && DEC_SIGN(pDecRight)) if (DEC_SIGN(pDecLeft) && DEC_SIGN(pDecRight))
...@@ -4572,7 +4573,7 @@ HRESULT WINAPI VarDecAdd(const DECIMAL* pDecLeft, const DECIMAL* pDecRight, DECI ...@@ -4572,7 +4573,7 @@ HRESULT WINAPI VarDecAdd(const DECIMAL* pDecLeft, const DECIMAL* pDecRight, DECI
} }
else if (DEC_SIGN(pDecLeft) && !DEC_SIGN(pDecRight)) else if (DEC_SIGN(pDecLeft) && !DEC_SIGN(pDecRight))
{ {
int cmp = VARIANT_DecCmp(pDecLeft, pDecRight); cmp = VARIANT_DecCmp(pDecLeft, pDecRight);
/* -x + y : Negative if x > y */ /* -x + y : Negative if x > y */
if (cmp > 0) if (cmp > 0)
...@@ -4593,7 +4594,7 @@ VarDecAdd_AsInvertedNegative: ...@@ -4593,7 +4594,7 @@ VarDecAdd_AsInvertedNegative:
} }
else if (!DEC_SIGN(pDecLeft) && DEC_SIGN(pDecRight)) else if (!DEC_SIGN(pDecLeft) && DEC_SIGN(pDecRight))
{ {
int cmp = VARIANT_DecCmp(pDecLeft, pDecRight); cmp = VARIANT_DecCmp(pDecLeft, pDecRight);
/* x + -y : Negative if x <= y */ /* x + -y : Negative if x <= y */
if (cmp <= 0) if (cmp <= 0)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment