ShuriZma
/
duckstation
mirror of https://github.com/stenzek/duckstation
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Common/FileSystem: Fix misspelling of 'separator'

This commit is contained in:
Michael Forney 2020-12-25 01:36:48 -08:00 committed by Connor McLaughlin
parent d0398c8a83
commit 7a40a843d4
5 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/common/file_system.cpp
View File

@ -112,7 +112,7 @@ void CanonicalizePath(char* Destination, u32 cbDestination, const char* Path, bo
// fix ospath // fix ospath
if (OSPath && (currentCh == '\\' || currentCh == '/')) if (OSPath && (currentCh == '\\' || currentCh == '/'))
currentCh = FS_OSPATH_SEPERATOR_CHARACTER; currentCh = FS_OSPATH_SEPARATOR_CHARACTER;
// copy character // copy character
if (destinationLength < cbDestination) if (destinationLength < cbDestination)
@ -547,7 +547,7 @@ void BuildOSPath(char* Destination, u32 cbDestination, const char* Path)
for (i = 0; i < pathLength; i++) for (i = 0; i < pathLength; i++)
{ {
if (Destination[i] == '/') if (Destination[i] == '/')
Destination[i] = FS_OSPATH_SEPERATOR_CHARACTER; Destination[i] = FS_OSPATH_SEPARATOR_CHARACTER;
} }
} }
else else
@ -556,7 +556,7 @@ void BuildOSPath(char* Destination, u32 cbDestination, const char* Path)
pathLength = std::max(pathLength, cbDestination - 1); pathLength = std::max(pathLength, cbDestination - 1);
for (i = 0; i < pathLength; i++) for (i = 0; i < pathLength; i++)
{ {
Destination[i] = (Path[i] == '/') ? FS_OSPATH_SEPERATOR_CHARACTER : Path[i]; Destination[i] = (Path[i] == '/') ? FS_OSPATH_SEPARATOR_CHARACTER : Path[i];
} }
Destination[pathLength] = '\0'; Destination[pathLength] = '\0';
@ -576,7 +576,7 @@ void BuildOSPath(String& Destination, const char* Path)
for (i = 0; i < pathLength; i++) for (i = 0; i < pathLength; i++)
{ {
if (Destination[i] == '/') if (Destination[i] == '/')
Destination[i] = FS_OSPATH_SEPERATOR_CHARACTER; Destination[i] = FS_OSPATH_SEPARATOR_CHARACTER;
} }
} }
else else
@ -586,7 +586,7 @@ void BuildOSPath(String& Destination, const char* Path)
Destination.Resize(pathLength); Destination.Resize(pathLength);
for (i = 0; i < pathLength; i++) for (i = 0; i < pathLength; i++)
{ {
Destination[i] = (Path[i] == '/') ? FS_OSPATH_SEPERATOR_CHARACTER : Path[i]; Destination[i] = (Path[i] == '/') ? FS_OSPATH_SEPARATOR_CHARACTER : Path[i];
} }
} }
} }

4
src/common/file_system.h
View File

@ -10,10 +10,10 @@
class ByteStream; class ByteStream;
#ifdef WIN32 #ifdef WIN32
#define FS_OSPATH_SEPERATOR_CHARACTER '\\' #define FS_OSPATH_SEPARATOR_CHARACTER '\\'
#define FS_OSPATH_SEPARATOR_STR "\\" #define FS_OSPATH_SEPARATOR_STR "\\"
#else #else
#define FS_OSPATH_SEPERATOR_CHARACTER '/' #define FS_OSPATH_SEPARATOR_CHARACTER '/'
#define FS_OSPATH_SEPARATOR_STR "/" #define FS_OSPATH_SEPARATOR_STR "/"
#endif #endif

4
src/duckstation-qt/qthostinterface.cpp
View File

@ -767,7 +767,7 @@ void QtHostInterface::saveInputProfile(const QString& profile_name)
QString QtHostInterface::getUserDirectoryRelativePath(const QString& arg) const QString QtHostInterface::getUserDirectoryRelativePath(const QString& arg) const
{ {
QString result = QString::fromStdString(m_user_directory); QString result = QString::fromStdString(m_user_directory);
result += FS_OSPATH_SEPERATOR_CHARACTER; result += FS_OSPATH_SEPARATOR_CHARACTER;
result += arg; result += arg;
return result; return result;
} }
@ -775,7 +775,7 @@ QString QtHostInterface::getUserDirectoryRelativePath(const QString& arg) const
QString QtHostInterface::getProgramDirectoryRelativePath(const QString& arg) const QString QtHostInterface::getProgramDirectoryRelativePath(const QString& arg) const
{ {
QString result = QString::fromStdString(m_program_directory); QString result = QString::fromStdString(m_program_directory);
result += FS_OSPATH_SEPERATOR_CHARACTER; result += FS_OSPATH_SEPARATOR_CHARACTER;
result += arg; result += arg;
return result; return result;
} }

4
src/frontend-common/game_list.cpp
View File

@ -1157,9 +1157,9 @@ std::string GameList::GetCoverImagePathForEntry(const GameListEntry* entry) cons
{ {
cover_path.Clear(); cover_path.Clear();
cover_path.AppendString(g_host_interface->GetUserDirectory().c_str()); cover_path.AppendString(g_host_interface->GetUserDirectory().c_str());
cover_path.AppendCharacter(FS_OSPATH_SEPERATOR_CHARACTER); cover_path.AppendCharacter(FS_OSPATH_SEPARATOR_CHARACTER);
cover_path.AppendString("covers"); cover_path.AppendString("covers");
cover_path.AppendCharacter(FS_OSPATH_SEPERATOR_CHARACTER); cover_path.AppendCharacter(FS_OSPATH_SEPARATOR_CHARACTER);
cover_path.AppendString(file_title.data(), static_cast<u32>(file_title.size())); cover_path.AppendString(file_title.data(), static_cast<u32>(file_title.size()));
cover_path.AppendCharacter('.'); cover_path.AppendCharacter('.');
cover_path.AppendString(extension); cover_path.AppendString(extension);

10
src/updater/updater.cpp
View File

@ -98,15 +98,15 @@ bool Updater::ParseZip()
for (size_t i = 0; i < len; i++) for (size_t i = 0; i < len; i++)
{ {
if (zip_filename_buffer[i] == '/' || zip_filename_buffer[i] == '\\') if (zip_filename_buffer[i] == '/' || zip_filename_buffer[i] == '\\')
zip_filename_buffer[i] = FS_OSPATH_SEPERATOR_CHARACTER; zip_filename_buffer[i] = FS_OSPATH_SEPARATOR_CHARACTER;
} }
// should never have a leading slash. just in case. // should never have a leading slash. just in case.
while (zip_filename_buffer[0] == FS_OSPATH_SEPERATOR_CHARACTER) while (zip_filename_buffer[0] == FS_OSPATH_SEPARATOR_CHARACTER)
std::memmove(&zip_filename_buffer[1], &zip_filename_buffer[0], --len); std::memmove(&zip_filename_buffer[1], &zip_filename_buffer[0], --len);
// skip directories (we sort them out later) // skip directories (we sort them out later)
if (len > 0 && zip_filename_buffer[len - 1] != FS_OSPATH_SEPERATOR_CHARACTER) if (len > 0 && zip_filename_buffer[len - 1] != FS_OSPATH_SEPARATOR_CHARACTER)
{ {
// skip updater itself, since it was already pre-extracted. // skip updater itself, since it was already pre-extracted.
if (StringUtil::Strcasecmp(zip_filename_buffer, "updater.exe") != 0) if (StringUtil::Strcasecmp(zip_filename_buffer, "updater.exe") != 0)
@ -138,10 +138,10 @@ bool Updater::ParseZip()
const size_t len = ftu.destination_filename.length(); const size_t len = ftu.destination_filename.length();
for (size_t i = 0; i < len; i++) for (size_t i = 0; i < len; i++)
{ {
if (ftu.destination_filename[i] == FS_OSPATH_SEPERATOR_CHARACTER) if (ftu.destination_filename[i] == FS_OSPATH_SEPARATOR_CHARACTER)
{ {
std::string dir(ftu.destination_filename.begin(), ftu.destination_filename.begin() + i); std::string dir(ftu.destination_filename.begin(), ftu.destination_filename.begin() + i);
while (!dir.empty() && dir[dir.length() - 1] == FS_OSPATH_SEPERATOR_CHARACTER) while (!dir.empty() && dir[dir.length() - 1] == FS_OSPATH_SEPARATOR_CHARACTER)
dir.erase(dir.length() - 1); dir.erase(dir.length() - 1);
if (std::find(m_update_directories.begin(), m_update_directories.end(), dir) == m_update_directories.end()) if (std::find(m_update_directories.begin(), m_update_directories.end(), dir) == m_update_directories.end())