+ Cosmetics

3 files changed, 34 insertions, 34 deletions

diff --git a/src/SFileAddFile.cpp b/src/SFileAddFile.cpp
index 9d338b4..b2b2fd2 100644
--- a/src/SFileAddFile.cpp
+++ b/src/SFileAddFile.cpp
@@ -199,8 +199,8 @@ static int WriteDataToMpqFile(
                 }
 
                 // Call the compact callback, if any
-                if(ha->aAddFileCB != NULL)
-                    ha->aAddFileCB(ha->pvAddFileUserData, hf->dwFilePos, hf->dwDataSize, false);
+                if(ha->pfnAddFileCB != NULL)
+                    ha->pfnAddFileCB(ha->pvAddFileUserData, hf->dwFilePos, hf->dwDataSize, false);
 
                 // Update the compressed file size
                 pFileEntry->dwCmpSize += dwBytesInSector;
@@ -464,8 +464,8 @@ int SFileAddFile_Init(
         pFileEntry->FileTime = FileTime;
 
         // Call the callback, if needed
-        if(ha->aAddFileCB != NULL)
-            ha->aAddFileCB(ha->pvAddFileUserData, 0, hf->dwDataSize, false);
+        if(ha->pfnAddFileCB != NULL)
+            ha->pfnAddFileCB(ha->pvAddFileUserData, 0, hf->dwDataSize, false);
     }
 
     // If an error occured, remember it
@@ -657,8 +657,8 @@ int SFileAddFile_Finish(TMPQFile * hf)
     if(!hf->bErrorOccured)
     {
         // Call the user callback, if any
-        if(ha->aAddFileCB != NULL)
-            ha->aAddFileCB(ha->pvAddFileUserData, hf->dwDataSize, hf->dwDataSize, true);
+        if(ha->pfnAddFileCB != NULL)
+            ha->pfnAddFileCB(ha->pvAddFileUserData, hf->dwDataSize, hf->dwDataSize, true);
 
         // Update the size of the block table
         ha->pHeader->dwBlockTableSize = ha->dwFileTableSize;
@@ -1266,7 +1266,7 @@ bool WINAPI SFileSetFileLocale(HANDLE hFile, LCID lcNewLocale)
 //-----------------------------------------------------------------------------
 // Sets add file callback
 
-bool WINAPI SFileSetAddFileCallback(HANDLE hMpq, SFILE_ADDFILE_CALLBACK aAddFileCB, void * pvData)
+bool WINAPI SFileSetAddFileCallback(HANDLE hMpq, SFILE_ADDFILE_CALLBACK AddFileCB, void * pvUserData)
 {
     TMPQArchive * ha = (TMPQArchive *) hMpq;
 
@@ -1275,7 +1275,7 @@ bool WINAPI SFileSetAddFileCallback(HANDLE hMpq, SFILE_ADDFILE_CALLBACK aAddFile
         return false;
     }
 
-    ha->pvAddFileUserData = pvData;
-    ha->aAddFileCB = aAddFileCB;
+    ha->pvAddFileUserData = pvUserData;
+    ha->pfnAddFileCB = AddFileCB;
     return true;
 }
diff --git a/src/SFileCompactArchive.cpp b/src/SFileCompactArchive.cpp
index f408419..e469faa 100644
--- a/src/SFileCompactArchive.cpp
+++ b/src/SFileCompactArchive.cpp
@@ -29,8 +29,8 @@ static int CheckIfAllFilesKnown(TMPQArchive * ha, const char * szListFile, LPDWO
     if(nError == ERROR_SUCCESS && szListFile != NULL)
     {
         // Notify the user
-        if(ha->aCompactCB != NULL)
-            ha->aCompactCB(ha->pvCompactUserData, CCB_CHECKING_FILES, ha->CompactBytesProcessed, ha->CompactTotalBytes);
+        if(ha->pfnCompactCB != NULL)
+            ha->pfnCompactCB(ha->pvCompactUserData, CCB_CHECKING_FILES, ha->CompactBytesProcessed, ha->CompactTotalBytes);
 
         nError = SFileAddListFile((HANDLE)ha, szListFile);
     }
@@ -107,10 +107,10 @@ static int CopyNonMpqData(
         }
 
         // Update the progress
-        if(ha->aCompactCB != NULL)
+        if(ha->pfnCompactCB != NULL)
         {
             ha->CompactBytesProcessed += dwToRead;
-            ha->aCompactCB(ha->pvCompactUserData, CCB_COPYING_NON_MPQ_DATA, ha->CompactBytesProcessed, ha->CompactTotalBytes);
+            ha->pfnCompactCB(ha->pvCompactUserData, CCB_COPYING_NON_MPQ_DATA, ha->CompactBytesProcessed, ha->CompactTotalBytes);
         }
 
         // Decrement the number of data to be copied
@@ -192,10 +192,10 @@ static int CopyMpqFileSectors(
         }
 
         // Update compact progress
-        if(ha->aCompactCB != NULL)
+        if(ha->pfnCompactCB != NULL)
         {
             ha->CompactBytesProcessed += dwSectorOffsLen;
-            ha->aCompactCB(ha->pvCompactUserData, CCB_COMPACTING_FILES, ha->CompactBytesProcessed, ha->CompactTotalBytes);
+            ha->pfnCompactCB(ha->pvCompactUserData, CCB_COMPACTING_FILES, ha->CompactBytesProcessed, ha->CompactTotalBytes);
         }
 
         STORM_FREE(SectorOffsetsCopy);
@@ -250,10 +250,10 @@ static int CopyMpqFileSectors(
             }
 
             // Update compact progress
-            if(ha->aCompactCB != NULL)
+            if(ha->pfnCompactCB != NULL)
             {
                 ha->CompactBytesProcessed += dwRawDataInSector;
-                ha->aCompactCB(ha->pvCompactUserData, CCB_COMPACTING_FILES, ha->CompactBytesProcessed, ha->CompactTotalBytes);
+                ha->pfnCompactCB(ha->pvCompactUserData, CCB_COMPACTING_FILES, ha->CompactBytesProcessed, ha->CompactTotalBytes);
             }
 
             // Adjust byte counts
@@ -278,10 +278,10 @@ static int CopyMpqFileSectors(
                 nError = GetLastError();
 
             // Update compact progress
-            if(ha->aCompactCB != NULL)
+            if(ha->pfnCompactCB != NULL)
             {
                 ha->CompactBytesProcessed += dwCrcLength;
-                ha->aCompactCB(ha->pvCompactUserData, CCB_COMPACTING_FILES, ha->CompactBytesProcessed, ha->CompactTotalBytes);
+                ha->pfnCompactCB(ha->pvCompactUserData, CCB_COMPACTING_FILES, ha->CompactBytesProcessed, ha->CompactTotalBytes);
             }
 
             // Size of the CRC block is also included in the compressed file size
@@ -437,7 +437,7 @@ static int CopyMpqFiles(TMPQArchive * ha, LPDWORD pFileKeys, TFileStream * pNewS
 /* Public functions                                                          */
 /*****************************************************************************/
 
-bool WINAPI SFileSetCompactCallback(HANDLE hMpq, SFILE_COMPACT_CALLBACK aCompactCB, void * pvData)
+bool WINAPI SFileSetCompactCallback(HANDLE hMpq, SFILE_COMPACT_CALLBACK pfnCompactCB, void * pvUserData)
 {
     TMPQArchive * ha = (TMPQArchive *) hMpq;
 
@@ -446,8 +446,8 @@ bool WINAPI SFileSetCompactCallback(HANDLE hMpq, SFILE_COMPACT_CALLBACK aCompact
         return false;
     }
 
-    ha->aCompactCB = aCompactCB;
-    ha->pvCompactUserData = pvData;
+    ha->pfnCompactCB = pfnCompactCB;
+    ha->pvCompactUserData = pvUserData;
     return true;
 }
 
@@ -514,8 +514,8 @@ bool WINAPI SFileCompactArchive(HANDLE hMpq, const char * szListFile, bool /* bR
     if(nError == ERROR_SUCCESS && ha->UserDataPos != 0)
     {
         // Inform the application about the progress
-        if(ha->aCompactCB != NULL)
-            ha->aCompactCB(ha->pvCompactUserData, CCB_COPYING_NON_MPQ_DATA, ha->CompactBytesProcessed, ha->CompactTotalBytes);
+        if(ha->pfnCompactCB != NULL)
+            ha->pfnCompactCB(ha->pvCompactUserData, CCB_COPYING_NON_MPQ_DATA, ha->CompactBytesProcessed, ha->CompactTotalBytes);
 
         ByteOffset = 0;
         ByteCount = ha->UserDataPos;
@@ -576,11 +576,11 @@ bool WINAPI SFileCompactArchive(HANDLE hMpq, const char * szListFile, bool /* bR
         // 
 
         nError = SaveMPQTables(ha);
-        if(nError == ERROR_SUCCESS && ha->aCompactCB != NULL)
+        if(nError == ERROR_SUCCESS && ha->pfnCompactCB != NULL)
         {
             ha->CompactBytesProcessed += (ha->pHeader->dwHashTableSize * sizeof(TMPQHash));
             ha->CompactBytesProcessed += (ha->pHeader->dwBlockTableSize * sizeof(TMPQBlock));
-            ha->aCompactCB(ha->pvCompactUserData, CCB_CLOSING_ARCHIVE, ha->CompactBytesProcessed, ha->CompactTotalBytes);
+            ha->pfnCompactCB(ha->pvCompactUserData, CCB_CLOSING_ARCHIVE, ha->CompactBytesProcessed, ha->CompactTotalBytes);
         }
     }
 
diff --git a/src/StormLib.h b/src/StormLib.h
index a2d5513..0dd344f 100644
--- a/src/StormLib.h
+++ b/src/StormLib.h
@@ -745,13 +745,13 @@ typedef struct _TMPQArchive
     DWORD          dwAttrFlags;         // Flags for the (attributes) file, see MPQ_ATTRIBUTE_XXX
     DWORD          dwFlags;             // See MPQ_FLAG_XXXXX
 
-    SFILE_ADDFILE_CALLBACK aAddFileCB;  // Callback function for adding files
-    void         * pvAddFileUserData;   // User data thats passed to the callback
+    SFILE_ADDFILE_CALLBACK pfnAddFileCB;    // Callback function for adding files
+    void         * pvAddFileUserData;       // User data thats passed to the callback
 
-    SFILE_COMPACT_CALLBACK aCompactCB;  // Callback function for compacting the archive
-    void         * pvCompactUserData;   // User data thats passed to the callback
-    ULONGLONG      CompactBytesProcessed; // Amount of bytes that have been processed during a particular compact call
-    ULONGLONG      CompactTotalBytes;   // Total amount of bytes to be compacted
+    SFILE_COMPACT_CALLBACK pfnCompactCB;    // Callback function for compacting the archive
+    ULONGLONG      CompactBytesProcessed;   // Amount of bytes that have been processed during a particular compact call
+    ULONGLONG      CompactTotalBytes;       // Total amount of bytes to be compacted
+    void         * pvCompactUserData;       // User data thats passed to the callback
 } TMPQArchive;                                      
 
 // File handle structure
@@ -879,7 +879,7 @@ bool   WINAPI SFileCloseArchive(HANDLE hMpq);
 int    WINAPI SFileAddListFile(HANDLE hMpq, const char * szListFile);
 
 // Archive compacting
-bool   WINAPI SFileSetCompactCallback(HANDLE hMpq, SFILE_COMPACT_CALLBACK CompactCB, void * pvData);
+bool   WINAPI SFileSetCompactCallback(HANDLE hMpq, SFILE_COMPACT_CALLBACK CompactCB, void * pvUserData);
 bool   WINAPI SFileCompactArchive(HANDLE hMpq, const char * szListFile, bool bReserved);
 
 // Changing the maximum file count
@@ -960,7 +960,7 @@ bool   WINAPI SFileRenameFile(HANDLE hMpq, const char * szOldFileName, const cha
 bool   WINAPI SFileSetFileLocale(HANDLE hFile, LCID lcNewLocale);
 bool   WINAPI SFileSetDataCompression(DWORD DataCompression);
 
-bool   WINAPI SFileSetAddFileCallback(HANDLE hMpq, SFILE_ADDFILE_CALLBACK AddFileCB, void * pvData);
+bool   WINAPI SFileSetAddFileCallback(HANDLE hMpq, SFILE_ADDFILE_CALLBACK AddFileCB, void * pvUserData);
 
 //-----------------------------------------------------------------------------
 // Compression and decompression