From 1662ac463765dca908e35aa9c1ad195b9e0af93a Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Tue, 14 Feb 2006 11:07:46 +0000 Subject: [PATCH] return error --- stepmania/src/RageFileDriverDeflate.cpp | 6 ++++-- stepmania/src/RageFileDriverDeflate.h | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/stepmania/src/RageFileDriverDeflate.cpp b/stepmania/src/RageFileDriverDeflate.cpp index fc040e0496..f32fe66f32 100644 --- a/stepmania/src/RageFileDriverDeflate.cpp +++ b/stepmania/src/RageFileDriverDeflate.cpp @@ -523,12 +523,11 @@ void GzipString( const RString &sIn, RString &sOut ) sOut = mem.GetString(); } -bool GunzipString( const RString &sIn, RString &sOut ) +bool GunzipString( const RString &sIn, RString &sOut, RString &sError ) { RageFileObjMem mem; mem.PutString( sIn ); - RString sError; uint32_t iCRC32; RageFileBasic *pFile = GunzipFile( mem, sError, &iCRC32 ); if( pFile == NULL ) @@ -542,7 +541,10 @@ bool GunzipString( const RString &sIn, RString &sOut ) SAFE_DELETE( pFile ); if( iRet != iCRC32 ) + { + sError = "CRC error"; return false; + } return true; } diff --git a/stepmania/src/RageFileDriverDeflate.h b/stepmania/src/RageFileDriverDeflate.h index e28e8a738a..2091ca7253 100644 --- a/stepmania/src/RageFileDriverDeflate.h +++ b/stepmania/src/RageFileDriverDeflate.h @@ -70,7 +70,7 @@ RageFileBasic *GunzipFile( RageFileBasic &file, RString &sError, uint32_t *iCRC3 /* Quick helpers: */ void GzipString( const RString &sIn, RString &sOut ); -bool GunzipString( const RString &sIn, RString &sOut ); // returns false on CRC, etc. error +bool GunzipString( const RString &sIn, RString &sOut, RString &sError ); // returns false on CRC, etc. error #endif