libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-03-04 09:18:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

COMMON: Convert names to printable in FSDirectory warnings

Browse Source 
Unit separator, a control character, is used as a directory separator,
so this is needed now.
This commit is contained in:
djsrv 2021-08-02 22:55:40 -04:00 committed by Eugene Sandulenko
parent 02aace0598
commit 8501ce8e26
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
common/fs.cpp
View File

@ -240,10 +240,10 @@ const ArchiveMemberPtr FSDirectory::getMember(const Path &path) const {
FSNode *node = lookupCache(_fileCache, name);
if (!node || !node->exists()) {
warning("FSDirectory::getMember: '%s' does not exist", name.c_str());
warning("FSDirectory::getMember: '%s' does not exist", Common::toPrintable(name).c_str());
return ArchiveMemberPtr();
} else if (node->isDirectory()) {
warning("FSDirectory::getMember: '%s' is a directory", name.c_str());
warning("FSDirectory::getMember: '%s' is a directory", Common::toPrintable(name).c_str());
return ArchiveMemberPtr();
}
@ -260,7 +260,7 @@ SeekableReadStream *FSDirectory::createReadStreamForMember(const Path &path) con
return nullptr;
SeekableReadStream *stream = node->createReadStream();
if (!stream)
warning("FSDirectory::createReadStreamForMember: Can't create stream for file '%s'", name.c_str());
warning("FSDirectory::createReadStreamForMember: Can't create stream for file '%s'", Common::toPrintable(name).c_str());
return stream;
}
@ -303,12 +303,12 @@ void FSDirectory::cacheDirectoryRecursive(FSNode node, int depth, const Path& pr
// Always warn in this case as it's when there are 2 directories at the same place with different case
// That means a problem in user installation as lookups are always done case insensitive
warning("FSDirectory::cacheDirectory: name clash when building cache, ignoring sub-directory '%s'",
name.c_str());
Common::toPrintable(name).c_str());
} else {
if (_subDirCache.contains(lowercaseName)) {
if (!_ignoreClashes) {
warning("FSDirectory::cacheDirectory: name clash when building subDirCache with subdirectory '%s'",
name.c_str());
Common::toPrintable(name).c_str());
}
}
cacheDirectoryRecursive(*it, depth - 1, _flat ? prefix : lowercaseName + DIR_SEPARATOR);
@ -318,7 +318,7 @@ void FSDirectory::cacheDirectoryRecursive(FSNode node, int depth, const Path& pr
if (_fileCache.contains(lowercaseName)) {
if (!_ignoreClashes) {
warning("FSDirectory::cacheDirectory: name clash when building cache, ignoring file '%s'",
name.c_str());
Common::toPrintable(name).c_str());
}
} else {
_fileCache[lowercaseName] = *it;