Changeset 21737 for branches/gcc-kmk/src/kernel32/winimgres.cpp

Timestamp:

Oct 24, 2011, 9:23:36 PM (14 years ago)

Author:

dmik

Message:

Common compiler warnings and errors.

File:

• branches/gcc-kmk/src/kernel32/winimgres.cpp (modified) (4 diffs)

branches/gcc-kmk/src/kernel32/winimgres.cpp

@@ -37 +37 @@
 #define MAX_RES 17
 typedef struct {
-  char *typename;
-  int   namelen;
+  const char *typenam;
+  int namelen;
 } STD_RESTYPE;
 
@@ -131 +131 @@
     typelen = strlen(lpszType);
 
-        for(int i=0;i<MAX_RES;i++) {
+        int i;
+        for(i=0;i<MAX_RES;i++) {
             if(ResType[i].namelen &&
                ResType[i].namelen == typelen &&
-               stricmp(lpszType, ResType[i].typename) == 0)
+               stricmp(lpszType, ResType[i].typenam) == 0)
                     break;
         }
@@ -186 +187 @@
     typelen = strlen(astring1);
 
-        for(int i=0;i<MAX_RES;i++) {
+        int i;
+        for(i=0;i<MAX_RES;i++) {
             if(ResType[i].namelen &&
                ResType[i].namelen == typelen &&
-               stricmp(astring1, ResType[i].typename) == 0)
+               stricmp(astring1, ResType[i].typenam) == 0)
                     break;
         }
@@ -603 +605 @@
             pstring = (PIMAGE_RESOURCE_DIR_STRING_U)((ULONG)pResRootDir + nameOffset);
             int len = lstrlenWtoA( pstring->NameString, pstring->Length );
-            char *typename = (char *)malloc( len + 1 );
-            lstrcpynWtoA(typename, pstring->NameString, len + 1 );
-            typename[len] = 0;
-
-        fRet = lpEnumFunc(hmod, typename, lParam);
-            free(typename);
+            char *typenam = (char *)malloc( len + 1 );
+            lstrcpynWtoA(typenam, pstring->NameString, len + 1 );
+            typenam[len] = 0;
+
+        fRet = lpEnumFunc(hmod, typenam, lParam);
+            free(typenam);
         }
         else {