Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix error messages / formatting. (cherry picked from commit 461b8c820cffe97077568f2c25fa480ffec131e4)

master
buginator 2010-10-29 18:59:35 -04:00
parent 50aafb279e
commit bbcad634bc
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
lib/framework/frame.c
View File

@ -385,8 +385,7 @@ static bool loadFile2(const char *pFileName, char **ppFileData, UDWORD *pFileSiz
*ppFileData = NULL;
}
debug(LOG_ERROR, "loadFile2: Reading %s short: %s",
pFileName, PHYSFS_getLastError());
debug(LOG_ERROR, "Reading %s short: %s", pFileName, PHYSFS_getLastError());
assert(false);
return false;
}
@ -399,8 +398,7 @@ static bool loadFile2(const char *pFileName, char **ppFileData, UDWORD *pFileSiz
*ppFileData = NULL;
}
debug(LOG_ERROR, "loadFile2: Error closing %s: %s", pFileName,
PHYSFS_getLastError());
debug(LOG_ERROR, "Error closing %s: %s", pFileName, PHYSFS_getLastError());
assert(false);
return false;
}
@ -421,13 +419,14 @@ PHYSFS_file* openSaveFile(const char* fileName)
{
const char *found = PHYSFS_getRealDir(fileName);
debug(LOG_ERROR, "saveFile: %s could not be opened: %s", fileName, PHYSFS_getLastError());
debug(LOG_ERROR, "%s could not be opened: %s", fileName, PHYSFS_getLastError());
if (found)
{
debug(LOG_ERROR, "saveFile: %s found as %s", fileName, found);
debug(LOG_ERROR, "%s found as %s", fileName, found);
}
assert(!"openSaveFile: couldn't open file for writing");
return NULL;
}
return fileHandle;
@ -445,30 +444,31 @@ bool saveFile(const char *pFileName, const char *pFileData, UDWORD fileSize)
pfile = openSaveFile(pFileName);
if (!pfile)
{
ASSERT(false, "Couldn't save file %s (%s)?", pFileName, PHYSFS_getLastError());
return false;
}
if (PHYSFS_write(pfile, pFileData, 1, size) != size) {
debug(LOG_ERROR, "saveFile: %s could not write: %s", pFileName,
PHYSFS_getLastError());
if (PHYSFS_write(pfile, pFileData, 1, size) != size)
{
debug(LOG_ERROR, "%s could not write: %s", pFileName, PHYSFS_getLastError());
assert(false);
return false;
}
if (!PHYSFS_close(pfile)) {
debug(LOG_ERROR, "saveFile: Error closing %s: %s", pFileName,
PHYSFS_getLastError());
if (!PHYSFS_close(pfile))
{
debug(LOG_ERROR, "Error closing %s: %s", pFileName, PHYSFS_getLastError());
assert(false);
return false;
}
if (PHYSFS_getRealDir(pFileName) == NULL) {
if (PHYSFS_getRealDir(pFileName) == NULL)
{
// weird
debug(LOG_ERROR, "saveFile: PHYSFS_getRealDir(%s) returns NULL?!",
pFileName);
} else {
debug(LOG_WZ, "Successfully wrote to %s%s%s with %d bytes",
PHYSFS_getRealDir(pFileName), PHYSFS_getDirSeparator(),
pFileName, size);
debug(LOG_ERROR, "PHYSFS_getRealDir(%s) returns NULL (%s)?!", pFileName, PHYSFS_getLastError());
}
else
{
debug(LOG_WZ, "Successfully wrote to %s%s%s with %d bytes", PHYSFS_getRealDir(pFileName), PHYSFS_getDirSeparator(), pFileName, size);
}
return true;
}