From 58d46274ef17a5db6e6970aa5041df48d531ac42 Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Sun, 25 Apr 2021 14:51:39 -0700 Subject: [PATCH] Common: FileUtil rename buildfix. --- Common/File/DirListing.cpp | 2 +- Core/FileSystems/DirectoryFileSystem.cpp | 2 +- Core/FileSystems/VirtualDiscFileSystem.cpp | 2 +- UI/GameInfoCache.cpp | 4 ++-- UWP/StorageFileLoader.cpp | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Common/File/DirListing.cpp b/Common/File/DirListing.cpp index 86e406980f..5523128707 100644 --- a/Common/File/DirListing.cpp +++ b/Common/File/DirListing.cpp @@ -221,7 +221,7 @@ int64_t GetDirectoryRecursiveSize(const std::string & path, const char *filter, std::vector fileInfo; GetFilesInDir(path.c_str(), &fileInfo, filter, flags); int64_t sizeSum = 0; - // Note: getFileInDir does not fill in fileSize properly. + // Note: GetFilesInDir does not fill in fileSize properly. for (size_t i = 0; i < fileInfo.size(); i++) { FileInfo finfo; GetFileInfo(fileInfo[i].fullName.c_str(), &finfo); diff --git a/Core/FileSystems/DirectoryFileSystem.cpp b/Core/FileSystems/DirectoryFileSystem.cpp index 024a8416cb..89869e7ca1 100644 --- a/Core/FileSystems/DirectoryFileSystem.cpp +++ b/Core/FileSystems/DirectoryFileSystem.cpp @@ -753,7 +753,7 @@ PSPFileInfo DirectoryFileSystem::GetFileInfo(std::string filename) { if (x.type != FILETYPE_DIRECTORY) { File::FileInfo info; if (!File::GetFileInfo(fullName.c_str(), &info)) { - ERROR_LOG(FILESYS, "DirectoryFileSystem::GetFileInfo: GetFileDetails failed: %s", fullName.c_str()); + ERROR_LOG(FILESYS, "DirectoryFileSystem::GetFileInfo: GetFileInfo failed: %s", fullName.c_str()); } else { x.size = info.size; x.access = info.access; diff --git a/Core/FileSystems/VirtualDiscFileSystem.cpp b/Core/FileSystems/VirtualDiscFileSystem.cpp index 2a61430fb4..c13ef3f1e8 100644 --- a/Core/FileSystems/VirtualDiscFileSystem.cpp +++ b/Core/FileSystems/VirtualDiscFileSystem.cpp @@ -634,7 +634,7 @@ PSPFileInfo VirtualDiscFileSystem::GetFileInfo(std::string filename) { if (x.type != FILETYPE_DIRECTORY) { File::FileInfo details; if (!File::GetFileInfo(fullName.c_str(), &details)) { - ERROR_LOG(FILESYS, "DirectoryFileSystem::GetFileInfo: GetFileDetails failed: %s", fullName.c_str()); + ERROR_LOG(FILESYS, "DirectoryFileSystem::GetFileInfo: GetFileInfo failed: %s", fullName.c_str()); x.size = 0; x.access = 0; } else { diff --git a/UI/GameInfoCache.cpp b/UI/GameInfoCache.cpp index 791c89bcee..2f12fc8e08 100644 --- a/UI/GameInfoCache.cpp +++ b/UI/GameInfoCache.cpp @@ -151,7 +151,7 @@ u64 GameInfo::GetSaveDataSizeInBytes() { for (size_t j = 0; j < saveDataDir.size(); j++) { std::vector fileInfo; File::GetFilesInDir(saveDataDir[j].c_str(), &fileInfo); - // Note: getFileInDir does not fill in fileSize properly. + // Note: GetFilesInDir does not fill in fileSize properly. for (size_t i = 0; i < fileInfo.size(); i++) { File::FileInfo finfo; File::GetFileInfo(fileInfo[i].fullName.c_str(), &finfo); @@ -178,7 +178,7 @@ u64 GameInfo::GetInstallDataSizeInBytes() { for (size_t j = 0; j < saveDataDir.size(); j++) { std::vector fileInfo; File::GetFilesInDir(saveDataDir[j].c_str(), &fileInfo); - // Note: getFileInDir does not fill in fileSize properly. + // Note: GetFilesInDir does not fill in fileSize properly. for (size_t i = 0; i < fileInfo.size(); i++) { File::FileInfo finfo; File::GetFileInfo(fileInfo[i].fullName.c_str(), &finfo); diff --git a/UWP/StorageFileLoader.cpp b/UWP/StorageFileLoader.cpp index 0d566d4722..f979aa8e3a 100644 --- a/UWP/StorageFileLoader.cpp +++ b/UWP/StorageFileLoader.cpp @@ -136,7 +136,7 @@ std::string StorageFileLoader::Path() const { } std::string StorageFileLoader::Extension() { - return "." + getFileExtension(path_); + return "." + File::GetFileExtension(path_); } void StorageFileLoader::EnsureOpen() {