From 5b80d1beeaa3c592680caab444fda7a0f2e1c741 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Sun, 26 Jun 2011 22:14:21 +0200 Subject: [PATCH] oleaut32: Unshadow cmp to make code work (Coverity). --- dlls/oleaut32/vartype.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c index 2b1307ec5a8..3dd65d880ad 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)