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

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 5b80d1beeaa3c592680caab444fda7a0f2e1c741
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=5b80d1beeaa3c592680caab444...

Author: Marcus Meissner 
Date:   Sun Jun 26 22:14:21 2011 +0200

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

---

dlls/oleaut32/vartype.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c
index 2b1307e..3dd65d8 100644
--- a/dlls/oleaut32/vartype.c
+++ b/dlls/oleaut32/vartype.c
@@ -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 */
     ULONG overflow = 0;
     BYTE sign = DECIMAL_POS;
+    int cmp;

/* Correct for the sign of the result */
     if (DEC_SIGN(pDecLeft) && DEC_SIGN(pDecRight))
@@ -4572,7 +4573,7 @@ HRESULT WINAPI VarDecAdd(const DECIMAL* pDecLeft, const DECIMAL* pDecRight, DECI
     }
     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 */
       if (cmp > 0)
@@ -4593,7 +4594,7 @@ VarDecAdd_AsInvertedNegative:
     }
     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 */
       if (cmp <= 0)