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

error checking

Browse Source
This commit is contained in:
Glenn Maynard
2004-06-06 20:56:46 +00:00
parent d044b29ca4
commit 9762c6583f
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/RageUtil.cpp
+15 -3
View File
@@ -556,8 +556,19 @@ CString DerefRedir(const CString &path)
/* XXX: This can be used to read one line from any file; rename it. */ /* XXX: This can be used to read one line from any file; rename it. */
CString GetRedirContents(const CString &path) CString GetRedirContents(const CString &path)
{ {
RageFile file(path); RageFile file;
CString sNewFileName = file.GetLine(); if( !file.Open(path) )
{
LOG->Warn( "GetRedirContents(%s): %s", path.c_str(), file.GetError().c_str() );
return "";
}
CString sNewFileName;
if( file.GetLine( sNewFileName ) == -1 )
{
LOG->Warn( "GetRedirContents(%s): %s", path.c_str(), file.GetError().c_str() );
return "";
}
StripCrnl(sNewFileName); StripCrnl(sNewFileName);
return sNewFileName; return sNewFileName;
@@ -1193,7 +1204,8 @@ bool FileRead(RageFile& f, CString& sOut)
{ {
if (f.AtEOF()) if (f.AtEOF())
return false; return false;
sOut = f.GetLine(); if( f.GetLine(sOut) == -1 )
return false;
return true; return true;
} }