Lauri Kenttä : winemenubuilder: Avoid warning about uninitialized value (clang).
Alexandre Julliard
julliard at winehq.org
Wed May 18 11:15:33 CDT 2011
Module: wine
Branch: master
Commit: c2705081ac09e7b565ee6fb29d11d4644f885317
URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2705081ac09e7b565ee6fb29d11d4644f885317
Author: Lauri Kenttä <lauri.kentta at gmail.com>
Date: Tue May 17 23:33:03 2011 +0300
winemenubuilder: Avoid warning about uninitialized value (clang).
---
programs/winemenubuilder/winemenubuilder.c | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c
index 5908e4e..56c0f80 100644
--- a/programs/winemenubuilder/winemenubuilder.c
+++ b/programs/winemenubuilder/winemenubuilder.c
@@ -1012,8 +1012,7 @@ static HRESULT platform_write_icon(IStream *icoStream, int exeIndex, LPCWSTR ico
for (i = 0; i < numEntries; i++)
{
- int bestIndex;
- int maxBits = -1;
+ int bestIndex = i;
int j;
BOOLEAN duplicate = FALSE;
int w, h;
@@ -1034,14 +1033,13 @@ static HRESULT platform_write_icon(IStream *icoStream, int exeIndex, LPCWSTR ico
}
if (duplicate)
continue;
- for (j = i; j < numEntries; j++)
+ for (j = i + 1; j < numEntries; j++)
{
if (iconDirEntries[j].bWidth == iconDirEntries[i].bWidth &&
iconDirEntries[j].bHeight == iconDirEntries[i].bHeight &&
- iconDirEntries[j].wBitCount >= maxBits)
+ iconDirEntries[j].wBitCount >= iconDirEntries[bestIndex].wBitCount)
{
bestIndex = j;
- maxBits = iconDirEntries[j].wBitCount;
}
}
WINE_TRACE("Selected: %d\n", bestIndex);
More information about the wine-cvs
mailing list