Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed some overly noisy log tracing in JFileSystem that I had previously put in. One nice thought would be the addition of a 'volume' to tracing messages so that you could choose how much verbosity you want in the logging output, but that's a luxury for the moment.

Browse Source
This commit is contained in:
wrenczes@gmail.com
2011-03-01 08:57:31 +00:00
parent 1c228aba7a
commit 772828bced
1 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
JGE/src/JFileSystem.cpp
-8
View File
@@ -144,7 +144,6 @@ void JFileSystem::DetachZipFile()
{ {
if (mZipAvailable && mZipFile != NULL) if (mZipAvailable && mZipFile != NULL)
{ {
JLOG("DetachZipFile");
int error = unzCloseCurrentFile(mZipFile); int error = unzCloseCurrentFile(mZipFile);
if (error < 0 ) if (error < 0 )
JLOG("error calling unzCloseCurrentFile"); JLOG("error calling unzCloseCurrentFile");
@@ -162,16 +161,13 @@ void JFileSystem::DetachZipFile()
bool JFileSystem::OpenFile(const string &filename) bool JFileSystem::OpenFile(const string &filename)
{ {
string path = mResourceRoot + filename; string path = mResourceRoot + filename;
JLOG(path.c_str());
if (mZipAvailable && mZipFile != NULL) if (mZipAvailable && mZipFile != NULL)
{ {
JLOG("zip available, calling preload")
preloadZip(mZipFileName); preloadZip(mZipFileName);
map<string,JZipCache *>::iterator it = mZipCache.find(mZipFileName); map<string,JZipCache *>::iterator it = mZipCache.find(mZipFileName);
if (it == mZipCache.end()) if (it == mZipCache.end())
{ {
JLOG("zip cache miss, detaching & calling open again");
DetachZipFile(); DetachZipFile();
return OpenFile(filename); return OpenFile(filename);
} }
@@ -179,7 +175,6 @@ bool JFileSystem::OpenFile(const string &filename)
map<string,unz_file_pos *>::iterator it2 = zc->dir.find(filename); map<string,unz_file_pos *>::iterator it2 = zc->dir.find(filename);
if (it2 == zc->dir.end()) if (it2 == zc->dir.end())
{ {
JLOG("directory miss, detaching & calling open again");
DetachZipFile(); DetachZipFile();
return OpenFile(filename); return OpenFile(filename);
} }
@@ -187,7 +182,6 @@ bool JFileSystem::OpenFile(const string &filename)
char filenameInzip[256]; char filenameInzip[256];
unz_file_info fileInfo; unz_file_info fileInfo;
JLOG("calling unzGetCurrentFileInfo");
if (unzGetCurrentFileInfo(mZipFile, &fileInfo, filenameInzip, sizeof(filenameInzip), NULL, 0, NULL, 0) == UNZ_OK) if (unzGetCurrentFileInfo(mZipFile, &fileInfo, filenameInzip, sizeof(filenameInzip), NULL, 0, NULL, 0) == UNZ_OK)
mFileSize = fileInfo.uncompressed_size; mFileSize = fileInfo.uncompressed_size;
else else
@@ -207,11 +201,9 @@ bool JFileSystem::OpenFile(const string &filename)
return true; return true;
} }
#else #else
JLOG("calling sceIOpen");
mFile = sceIoOpen(path.c_str(), PSP_O_RDONLY, 0777); mFile = sceIoOpen(path.c_str(), PSP_O_RDONLY, 0777);
if (mFile > 0) if (mFile > 0)
{ {
JLOG("calling sceIoSeek");
mFileSize = sceIoLseek(mFile, 0, PSP_SEEK_END); mFileSize = sceIoLseek(mFile, 0, PSP_SEEK_END);
sceIoLseek(mFile, 0, PSP_SEEK_SET); sceIoLseek(mFile, 0, PSP_SEEK_SET);
return true; return true;