dlls/user32/exticon.c -- avoid warning

Gerald Pfeifer pfeifer at dbai.tuwien.ac.at
Wed Nov 28 16:59:45 CST 2007


Another older patch I found in my tree which avoids a warning.  I
believe I have seens this with a GCC 4.3 snapshot.

And, reducing the scope also makes it easier to understand the code.
(Guess how I now. ;-)

Gerald

ChangeLog:
Reduce scope of variable in ICO_ExtractIconExW() and initialize it.

Index: dlls/user32/exticon.c
===================================================================
RCS file: /home/wine/wine/dlls/user32/exticon.c,v
retrieving revision 1.2
diff -u -3 -p -r1.2 exticon.c
--- dlls/user32/exticon.c	21 May 2007 14:42:15 -0000	1.2
+++ dlls/user32/exticon.c	28 Nov 2007 22:56:37 -0000
@@ -338,7 +338,6 @@ static UINT ICO_ExtractIconExW(
 	UINT16		iconDirCount = 0,iconCount = 0;
 	LPBYTE		peimage;
 	HANDLE		fmapping;
-	ULONG		uSize;
 	DWORD		fsizeh,fsizel;
         WCHAR		szExePath[MAX_PATH];
         DWORD		dwSearchReturn;
@@ -420,6 +419,7 @@ static UINT ICO_ExtractIconExW(
 	  NE_NAMEINFO	*pIconStorage = NULL;
 	  NE_NAMEINFO	*pIconDir = NULL;
 	  LPicoICONDIR	lpiID = NULL;
+	  ULONG		uSize = 0;
 
           TRACE("-- OS2/icon Signature (0x%08x)\n", sig);
 



More information about the wine-patches mailing list