libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-25 13:42:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Changed FSDirectory::getSubDirectory to return a FSDirectory pointer instead of a SharedPtr

Browse Source 
svn-id: r34334
This commit is contained in:
Max Horn 2008-09-04 20:03:08 +00:00
parent cf7ab829e3
commit 5409b2b456
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
common/archive.cpp
View File

@ -93,14 +93,13 @@ SeekableReadStream *FSDirectory::openFile(const String &name) {
return stream;
}
SharedPtr<FSDirectory> FSDirectory::getSubDirectory(const String &name) {
FSDirectory *FSDirectory::getSubDirectory(const String &name) {
if (name.empty() || !_node.isDirectory()) {
// return a null SharedPtr
return SharedPtr<FSDirectory>();
return 0;
}
FilesystemNode node = lookupCache(_subDirCache, name);
return SharedPtr<FSDirectory>(new FSDirectory(node));
return new FSDirectory(node);
}
void FSDirectory::cacheDirectoryRecursive(FilesystemNode node, int depth, const String& prefix) {

2
common/archive.h
View File

@ -136,7 +136,7 @@ public:
* Create a new FSDirectory pointing to a sub directory of the instance.
* @return A new FSDirectory instance conveniently wrapped in a SharedPtr.
*/
SharedPtr<FSDirectory> getSubDirectory(const String &name);
FSDirectory *getSubDirectory(const String &name);
virtual bool hasFile(const String &name);
virtual int matchPattern(StringList &list, const String &pattern);