Fixed some warnings

[SFmpqapi.git] / SFmpqapi.cpp

diff --git a/SFmpqapi.cpp b/SFmpqapi.cpp
index 0f5acaf..db69b60 100644 (file)
--- a/SFmpqapi.cpp
+++ b/SFmpqapi.cpp
@@ -1124,7 +1124,7 @@ DWORD SFMPQAPI WINAPI SFileGetFileInfo(MPQHANDLE hFile, DWORD dwInfoType)
        return (DWORD)-1;
 }
 
-DWORD SFMPQAPI WINAPI SFileSetFilePointer(MPQHANDLE hFile, long lDistanceToMove, PLONG lplDistanceToMoveHigh, DWORD dwMoveMethod)
+DWORD SFMPQAPI WINAPI SFileSetFilePointer(MPQHANDLE hFile, LONG lDistanceToMove, PLONG lplDistanceToMoveHigh, DWORD dwMoveMethod)
 {
        if (!hFile) {
                SetLastError(ERROR_INVALID_PARAMETER);
@@ -1176,7 +1176,7 @@ BOOL SFMPQAPI WINAPI SFileReadFile(MPQHANDLE hFile,LPVOID lpBuffer,DWORD nNumber
        }
        if (lpOverlapped)
                if (lpOverlapped->Internal || lpOverlapped->InternalHigh || lpOverlapped->Offset || lpOverlapped->OffsetHigh || lpOverlapped->hEvent)
-                       SFileSetFilePointer(hFile,lpOverlapped->Offset,(long *)&lpOverlapped->OffsetHigh,FILE_BEGIN);
+                       SFileSetFilePointer(hFile,lpOverlapped->Offset,(LONG *)&lpOverlapped->OffsetHigh,FILE_BEGIN);
        if (nNumberOfBytesToRead==0) {
                if (lpNumberOfBytesRead) *lpNumberOfBytesRead = 0;
                if (lpOverlapped) lpOverlapped->InternalHigh = 0;
@@ -2576,7 +2576,7 @@ BOOL SFMPQAPI WINAPI MpqCompactArchive(MPQHANDLE hMPQ)
        DWORD i;
        if (hFile==INVALID_HANDLE_VALUE) {
                for (i=0;i<10000;i++) {
-                       sprintf(lpFileName,"%s.compact.%04ld",mpqOpenArc->lpFileName,i);
+                       sprintf(lpFileName,"%s.compact.%04d",mpqOpenArc->lpFileName,i);
 
                        hFile = CreateFile(lpFileName,GENERIC_READ|GENERIC_WRITE,0,0,CREATE_NEW,0,0);
                        if (hFile!=INVALID_HANDLE_VALUE) break;
@@ -3404,7 +3404,7 @@ DWORD DetectFileSeedEx(MPQARCHIVE * mpqOpenArc, HASHTABLEENTRY * lpHashEntry, LP
                else {
                        HANDLE hlFile,hMPQ=(HANDLE)mpqOpenArc;
                        DWORD fsz;
-                       char *listbuffer;
+                       char *listbuffer = 0;
                        LCID lcOldLocale = LocaleID;
                        for (DWORD lcn=0;lcn<nLocales;lcn++) {
                                LocaleID = availLocales[lcn];
@@ -3427,7 +3427,7 @@ DWORD DetectFileSeedEx(MPQARCHIVE * mpqOpenArc, HASHTABLEENTRY * lpHashEntry, LP
                                        }
                                        SFileCloseFile(hlFile);
                                        if (listbuffer!=0) {
-                                               char *listline;
+                                               char *listline = 0;
                                                for (listline=listbuffer;listline!=0;listline=nextline(listline)) {
                                                        if (listline[0]==0) break;
                                                        DWORD lnlen=strlnlen(listline);