actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix RageFileObjDeflate::FlushInternal not flushing correctly when 4k or more needs to be flushed.

Browse Source
This commit is contained in:
Glenn Maynard
2005-03-23 21:26:07 +00:00
parent 2cb9f7682c
commit da6d8944d7
1 changed files with 26 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/RageFileDriverDeflate.cpp
+26 -6
View File
@@ -227,10 +227,13 @@ RageFileObjDeflate::~RageFileObjDeflate()
int RageFileObjDeflate::WriteInternal( const void *pBuffer, size_t iBytes ) int RageFileObjDeflate::WriteInternal( const void *pBuffer, size_t iBytes )
{ {
if( iBytes == 0 )
return 0;
m_pDeflate->next_in = (Bytef*) pBuffer; m_pDeflate->next_in = (Bytef*) pBuffer;
m_pDeflate->avail_in = iBytes; m_pDeflate->avail_in = iBytes;
while( m_pDeflate->avail_in > 0 ) while( 1 )
{ {
char buf[1024*4]; char buf[1024*4];
m_pDeflate->next_out = (Bytef *) buf; m_pDeflate->next_out = (Bytef *) buf;
@@ -243,15 +246,24 @@ int RageFileObjDeflate::WriteInternal( const void *pBuffer, size_t iBytes )
if( m_pDeflate->avail_out < sizeof(buf) ) if( m_pDeflate->avail_out < sizeof(buf) )
{ {
int iRet = m_pFile->Write( buf, sizeof(buf)-m_pDeflate->avail_out ); int iBytes = sizeof(buf)-m_pDeflate->avail_out;
int iRet = m_pFile->Write( buf, iBytes );
if( iRet == -1 ) if( iRet == -1 )
{ {
SetError( m_pFile->GetError() ); SetError( m_pFile->GetError() );
return -1; return -1;
} }
if( iRet < iBytes )
{
SetError( "Partial write" );
return -1;
} }
} }
if( m_pDeflate->avail_in == 0 && m_pDeflate->avail_out != 0 )
break;
}
return iBytes; return iBytes;
} }
@@ -272,17 +284,24 @@ int RageFileObjDeflate::FlushInternal()
if( err != Z_OK && err != Z_STREAM_END ) if( err != Z_OK && err != Z_STREAM_END )
FAIL_M( ssprintf("deflate: err %i", err) ); FAIL_M( ssprintf("deflate: err %i", err) );
if( m_pDeflate->avail_out > 0 ) if( m_pDeflate->avail_out < sizeof(buf) )
{ {
int iRet = m_pFile->Write( buf, sizeof(buf)-m_pDeflate->avail_out ); int iBytes = sizeof(buf)-m_pDeflate->avail_out;
int iRet = m_pFile->Write( buf, iBytes );
if( iRet == -1 ) if( iRet == -1 )
{ {
SetError( m_pFile->GetError() ); SetError( m_pFile->GetError() );
return -1; return -1;
} }
LOG->Trace("FlushInternal: wrote %i/%i", iRet, iBytes);
if( iRet < iBytes )
{
SetError( "Partial write" );
return -1;
}
} }
if( err == Z_STREAM_END ) if( err == Z_STREAM_END && m_pDeflate->avail_out != 0 )
return m_pFile->Flush(); return m_pFile->Flush();
} }
} }
@@ -484,7 +503,8 @@ int RageFileObjGzip::Finish()
return -1; return -1;
} }
return this->Flush(); /* Flush the CRC and wize that we just wrote directly to the file. */
return m_pFile->Flush();
} }
#include "RageFileDriverMemory.h" #include "RageFileDriverMemory.h"