From 84fc72d0de1c84f93431959bd730cd68685b987d Mon Sep 17 00:00:00 2001 From: mewmew Date: Sat, 8 Feb 2014 15:47:35 +0100 Subject: Fix warning in FileStream.cpp. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit StormLib/src/FileStream.cpp:1374:20: warning: converting ‘false’ to pointer type ‘TFileStream*’ [-Wconversion-null] return false; ^ StormLib/src/FileStream.cpp:2266:24: warning: converting ‘false’ to pointer type ‘TFileStream*’ [-Wconversion-null] return false; ^ --- src/FileStream.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/FileStream.cpp') diff --git a/src/FileStream.cpp b/src/FileStream.cpp index 963aae8..f4a4c5a 100644 --- a/src/FileStream.cpp +++ b/src/FileStream.cpp @@ -1371,7 +1371,7 @@ static TFileStream * FlatStream_Open(const TCHAR * szFileName, DWORD dwStreamFla { // Attempt to open the base stream if(!pStream->BaseOpen(pStream, pStream->szFileName, dwStreamFlags)) - return false; + return NULL; // Load the bitmap, if required to if(dwStreamFlags & STREAM_FLAG_USE_BITMAP) @@ -2263,7 +2263,7 @@ static TFileStream * Block4Stream_Open(const TCHAR * szFileName, DWORD dwStreamF if(NewBaseArray == NULL) { SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return false; + return NULL; } // Copy the old base data array to the new base data array -- cgit v1.2.3