From 788f4a24ad1ff2a4ea1048d156c7721fed615e8a Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sun, 21 Dec 2003 09:18:06 +0000 Subject: [PATCH] simplify --- stepmania/src/RageUtil.cpp | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/stepmania/src/RageUtil.cpp b/stepmania/src/RageUtil.cpp index 88be4e061e..2720d70747 100644 --- a/stepmania/src/RageUtil.cpp +++ b/stepmania/src/RageUtil.cpp @@ -1117,15 +1117,12 @@ bool FileCopy( CString sSrcFile, CString sDstFile ) if( !out.Open(sDstFile, RageFile::WRITE) ) return false; -#define CLEANUP_AND_RETURN(b) { delete data; return b; } - - int size = in.GetFileSize(); - char *data = new char[size]; - if( !data ) - CLEANUP_AND_RETURN( false ); - if( !in.Read(data,size) ) - CLEANUP_AND_RETURN( false ); - if( !out.Write(data,size) ) - CLEANUP_AND_RETURN( false ); - CLEANUP_AND_RETURN( true ); + CString data; + if( in.Read(data) == -1 ) + return false; + if( out.Write(data) == -1 ) + return false; + if( out.Flush() == -1 ) + return false; + return true; }