diff options
author | Yotam Barnoy | 2010-04-25 15:12:24 +0000 |
---|---|---|
committer | Yotam Barnoy | 2010-04-25 15:12:24 +0000 |
commit | f036b6b9d2a753c42354b78eb71ebfbd3d58cbc9 (patch) | |
tree | 6881c1687c807b49147d7ceb0a448fd3f4189b44 /backends/fs/psp | |
parent | aaaab9ec34bdb52d40b33295293fdbeab4568a93 (diff) | |
download | scummvm-rg350-f036b6b9d2a753c42354b78eb71ebfbd3d58cbc9.tar.gz scummvm-rg350-f036b6b9d2a753c42354b78eb71ebfbd3d58cbc9.tar.bz2 scummvm-rg350-f036b6b9d2a753c42354b78eb71ebfbd3d58cbc9.zip |
PSP:Implemented fingolfin's suggestion for cleaning up debugging code
svn-id: r48792
Diffstat (limited to 'backends/fs/psp')
-rw-r--r-- | backends/fs/psp/psp-fs.cpp | 8 | ||||
-rw-r--r-- | backends/fs/psp/psp-stream.cpp | 14 |
2 files changed, 1 insertions, 21 deletions
diff --git a/backends/fs/psp/psp-fs.cpp b/backends/fs/psp/psp-fs.cpp index a2b00209b0..d72c5108dd 100644 --- a/backends/fs/psp/psp-fs.cpp +++ b/backends/fs/psp/psp-fs.cpp @@ -108,7 +108,6 @@ PSPFilesystemNode::PSPFilesystemNode(const Common::String &p, bool verify) { PowerMan.endCriticalSection(); _isDirectory = S_ISDIR(st.st_mode); } - DEBUG_EXIT_FUNC(); } bool PSPFilesystemNode::exists() const { @@ -123,7 +122,6 @@ bool PSPFilesystemNode::exists() const { ret = access(_path.c_str(), F_OK); PowerMan.endCriticalSection(); - DEBUG_EXIT_FUNC(); return (ret == 0); } @@ -139,7 +137,6 @@ bool PSPFilesystemNode::isReadable() const { ret = access(_path.c_str(), R_OK); PowerMan.endCriticalSection(); - DEBUG_EXIT_FUNC(); return (ret == 0); } @@ -155,7 +152,6 @@ bool PSPFilesystemNode::isWritable() const { ret = access(_path.c_str(), W_OK); PowerMan.endCriticalSection(); - DEBUG_EXIT_FUNC(); return ret == 0; } @@ -175,7 +171,6 @@ AbstractFSNode *PSPFilesystemNode::getChild(const Common::String &n) const { AbstractFSNode *node = new PSPFilesystemNode(newPath, true); - DEBUG_EXIT_FUNC(); return node; } @@ -233,7 +228,6 @@ bool PSPFilesystemNode::getChildren(AbstractFSList &myList, ListMode mode, bool PowerMan.endCriticalSection(); - DEBUG_EXIT_FUNC(); return ret; } @@ -248,7 +242,7 @@ AbstractFSNode *PSPFilesystemNode::getParent() const { const char *end = lastPathComponent(_path, '/'); AbstractFSNode *node = new PSPFilesystemNode(Common::String(start, end - start), false); - DEBUG_EXIT_FUNC(); + return node; } diff --git a/backends/fs/psp/psp-stream.cpp b/backends/fs/psp/psp-stream.cpp index 2b99554182..8cb7dfea17 100644 --- a/backends/fs/psp/psp-stream.cpp +++ b/backends/fs/psp/psp-stream.cpp @@ -54,8 +54,6 @@ PSPIoStream::PSPIoStream(const Common::String &path, bool writeMode) _errorPos = 0; _errorHandle = 0; _suspendCount = 0; - - DEBUG_EXIT_FUNC(); } PSPIoStream::~PSPIoStream() { @@ -70,8 +68,6 @@ PSPIoStream::~PSPIoStream() { fclose((FILE *)_handle); // We don't need a critical section(?). Worst case, the handle gets closed on its own PowerMan.endCriticalSection(); - - DEBUG_EXIT_FUNC(); } /* Function to open the file pointed to by the path. @@ -90,7 +86,6 @@ void *PSPIoStream::open() { PowerMan.endCriticalSection(); - DEBUG_EXIT_FUNC(); return _handle; } @@ -100,7 +95,6 @@ bool PSPIoStream::err() const { PSP_ERROR("mem_ferror[%d], source[%d], suspend error[%d], pos[%d], _errorPos[%d], _errorHandle[%p], suspendCount[%d]\n", _ferror, _errorSource, _errorSuspend, _pos, _errorPos, _errorHandle, _suspendCount); - DEBUG_EXIT_FUNC(); return _ferror; } @@ -136,7 +130,6 @@ int32 PSPIoStream::size() const { PowerMan.endCriticalSection(); - DEBUG_EXIT_FUNC(); return length; } @@ -163,7 +156,6 @@ bool PSPIoStream::seek(int32 offs, int whence) { PowerMan.endCriticalSection(); - DEBUG_EXIT_FUNC(); return (ret == 0); } @@ -192,7 +184,6 @@ uint32 PSPIoStream::read(void *ptr, uint32 len) { PowerMan.endCriticalSection(); - DEBUG_EXIT_FUNC(); return ret; } @@ -218,7 +209,6 @@ uint32 PSPIoStream::write(const void *ptr, uint32 len) { PowerMan.endCriticalSection(); - DEBUG_EXIT_FUNC(); return ret; } @@ -239,7 +229,6 @@ bool PSPIoStream::flush() { PowerMan.endCriticalSection(); - DEBUG_EXIT_FUNC(); return (ret == 0); } @@ -255,7 +244,6 @@ PSPIoStream *PSPIoStream::makeFromPath(const Common::String &path, bool writeMod stream = 0; } - DEBUG_EXIT_FUNC(); return stream; } @@ -278,7 +266,6 @@ int PSPIoStream::suspend() { _handle = (void *)0xFFFFFFFF; // Set handle to non-null invalid value so makeFromPath doesn't return error } - DEBUG_EXIT_FUNC(); return 0; } @@ -306,7 +293,6 @@ int PSPIoStream::resume() { _errorHandle = _handle; } } - DEBUG_EXIT_FUNC(); return ret; } |