+ Make coverity happy

Ladislav Zezula · Ladislav Zezula · commit 81ec1c1e8e2a · 2015-05-28T14:46:13.000+02:00
diff --git a/make-msvc.bat b/make-msvc.bat
@@ -0,0 +1,2 @@
+set path=%PATH%;c:\Program Files (x86)\Microsoft Visual Studio 9.0\Common7\IDE
+devenv "StormLib_v09.sln" /build "Debug|Win32" /project "StormLib_test.vcproj" /projectconfig "Debug|Win32"
diff --git a/src/SBaseFileTable.cpp b/src/SBaseFileTable.cpp
@@ -1363,7 +1363,9 @@ static TMPQExtHeader * TranslateHetTable(TMPQHetTable * pHetTable, ULONGLONG * p
         }
     }
 
-    return &pHetHeader->ExtHdr;
+    // Keep Coverity happy
+    assert((TMPQExtHeader *)&pHetHeader->ExtHdr == (TMPQExtHeader *)pbLinearTable);
+    return (TMPQExtHeader *)pbLinearTable;
 }
 
 static DWORD GetFileIndex_Het(TMPQArchive * ha, const char * szFileName)
@@ -1758,7 +1760,9 @@ TMPQExtHeader * TranslateBetTable(
         }
     }
 
-    return &pBetHeader->ExtHdr;
+    // Keep Coverity happy
+    assert((TMPQExtHeader *)&pBetHeader->ExtHdr == (TMPQExtHeader *)pbLinearTable);
+    return (TMPQExtHeader *)pbLinearTable;
 }
 
 void FreeBetTable(TMPQBetTable * pBetTable)

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+set path=%PATH%;c:\Program Files (x86)\Microsoft Visual Studio 9.0\Common7\IDE`
	`2`	`+devenv "StormLib_v09.sln" /build "Debug\|Win32" /project "StormLib_test.vcproj" /projectconfig "Debug\|Win32"`
Original file line number	Diff line number	Diff line change
`@@ -1363,7 +1363,9 @@ static TMPQExtHeader * TranslateHetTable(TMPQHetTable * pHetTable, ULONGLONG * p`
`1363`	`1363`	`}`
`1364`	`1364`	`}`
`1365`	`1365`
`1366`		`- return &pHetHeader->ExtHdr;`
	`1366`	`+ // Keep Coverity happy`
	`1367`	`+ assert((TMPQExtHeader )&pHetHeader->ExtHdr == (TMPQExtHeader )pbLinearTable);`
	`1368`	`+ return (TMPQExtHeader *)pbLinearTable;`
`1367`	`1369`	`}`
`1368`	`1370`
`1369`	`1371`	`static DWORD GetFileIndex_Het(TMPQArchive * ha, const char * szFileName)`
`@@ -1758,7 +1760,9 @@ TMPQExtHeader * TranslateBetTable(`
`1758`	`1760`	`}`
`1759`	`1761`	`}`
`1760`	`1762`
`1761`		`- return &pBetHeader->ExtHdr;`
	`1763`	`+ // Keep Coverity happy`
	`1764`	`+ assert((TMPQExtHeader )&pBetHeader->ExtHdr == (TMPQExtHeader )pbLinearTable);`
	`1765`	`+ return (TMPQExtHeader *)pbLinearTable;`
`1762`	`1766`	`}`
`1763`	`1767`
`1764`	`1768`	`void FreeBetTable(TMPQBetTable * pBetTable)`