Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-02-24 16:11:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rename a couple of functions.

Browse Source
This commit is contained in:
Henrik Rydgård 2021-04-25 20:39:32 +02:00
parent 1b13badeb4
commit 08843673d9
14 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Common/File/DirListing.cpp
View File

@ -36,7 +36,7 @@
namespace File {
bool getFileInfo(const char *path, FileInfo * fileInfo) {
bool GetFileInfo(const char *path, FileInfo * fileInfo) {
// TODO: Expand relative paths?
fileInfo->fullName = path;
@ -100,7 +100,7 @@ bool FileInfo::operator <(const FileInfo & other) const {
return false;
}
size_t getFilesInDir(const char *directory, std::vector<FileInfo> * files, const char *filter, int flags) {
size_t GetFilesInDir(const char *directory, std::vector<FileInfo> * files, const char *filter, int flags) {
size_t foundEntries = 0;
std::set<std::string> filters;
if (filter) {
@ -197,12 +197,12 @@ size_t getFilesInDir(const char *directory, std::vector<FileInfo> * files, const
int64_t getDirectoryRecursiveSize(const std::string & path, const char *filter, int flags) {
std::vector<FileInfo> fileInfo;
getFilesInDir(path.c_str(), &fileInfo, filter, flags);
GetFilesInDir(path.c_str(), &fileInfo, filter, flags);
int64_t sizeSum = 0;
// Note: getFileInDir does not fill in fileSize properly.
for (size_t i = 0; i < fileInfo.size(); i++) {
FileInfo finfo;
getFileInfo(fileInfo[i].fullName.c_str(), &finfo);
GetFileInfo(fileInfo[i].fullName.c_str(), &finfo);
if (!finfo.isDirectory)
sizeSum += finfo.size;
else

4
Common/File/DirListing.h
View File

@ -23,13 +23,13 @@ struct FileInfo {
};
std::string getFileExtension(const std::string &fn);
bool getFileInfo(const char *path, FileInfo *fileInfo);
bool GetFileInfo(const char *path, FileInfo *fileInfo);
FILE *openCFile(const std::string &filename, const char *mode);
enum {
GETFILES_GETHIDDEN = 1
};
size_t getFilesInDir(const char *directory, std::vector<FileInfo> *files, const char *filter = nullptr, int flags = 0);
size_t GetFilesInDir(const char *directory, std::vector<FileInfo> *files, const char *filter = nullptr, int flags = 0);
int64_t getDirectoryRecursiveSize(const std::string &path, const char *filter = nullptr, int flags = 0);
#ifdef _WIN32

2
Common/File/PathBrowser.cpp
View File

@ -265,7 +265,7 @@ bool PathBrowser::GetListing(std::vector<File::FileInfo> &fileInfo, const char *
fileInfo = ApplyFilter(pendingFiles_, filter);
return true;
} else {
File::getFilesInDir(path_.c_str(), &fileInfo, filter);
File::GetFilesInDir(path_.c_str(), &fileInfo, filter);
return true;
}
}

6
Common/File/VFS/AssetReader.cpp
View File

@ -202,12 +202,12 @@ bool DirectoryAssetReader::GetFileListing(const char *path, std::vector<File::Fi
}
strcat(new_path, path);
File::FileInfo info;
if (!File::getFileInfo(new_path, &info))
if (!File::GetFileInfo(new_path, &info))
return false;
if (info.isDirectory)
{
File::getFilesInDir(new_path, listing, filter);
File::GetFilesInDir(new_path, listing, filter);
return true;
}
else
@ -227,5 +227,5 @@ bool DirectoryAssetReader::GetFileInfo(const char *path, File::FileInfo *info)
strcpy(new_path, path_);
}
strcat(new_path, path);
return File::getFileInfo(new_path, info);
return File::GetFileInfo(new_path, info);
}

4
Common/File/VFS/VFS.cpp
View File

@ -68,7 +68,7 @@ bool VFSGetFileListing(const char *path, std::vector<File::FileInfo> *listing, c
if (IsLocalPath(path)) {
// Local path, not VFS.
// INFO_LOG(IO, "Not a VFS path: %s . Reading local directory.", path);
File::getFilesInDir(path, listing, filter);
File::GetFilesInDir(path, listing, filter);
return true;
}
@ -95,7 +95,7 @@ bool VFSGetFileInfo(const char *path, File::FileInfo *info) {
if (IsLocalPath(path)) {
// Local path, not VFS.
// INFO_LOG(IO, "Not a VFS path: %s . Getting local file info.", path);
return File::getFileInfo(path, info);
return File::GetFileInfo(path, info);
}
bool fileSystemFound = false;

4
Core/FileLoaders/DiskCachingFileLoader.cpp
View File

@ -795,7 +795,7 @@ u32 DiskCachingFileLoaderCache::CountCachedFiles() {
}
std::vector<File::FileInfo> files;
return (u32)getFilesInDir(dir.c_str(), &files, "ppdc:");
return (u32)GetFilesInDir(dir.c_str(), &files, "ppdc:");
}
void DiskCachingFileLoaderCache::GarbageCollectCacheFiles(u64 goalBytes) {
@ -812,7 +812,7 @@ void DiskCachingFileLoaderCache::GarbageCollectCacheFiles(u64 goalBytes) {
}
std::vector<File::FileInfo> files;
File::getFilesInDir(dir.c_str(), &files, "ppdc:");
File::GetFilesInDir(dir.c_str(), &files, "ppdc:");
u64 remaining = goalBytes;
// TODO: Could order by LRU or etc.

4
Core/FileLoaders/LocalFileLoader.cpp
View File

@ -113,14 +113,14 @@ bool LocalFileLoader::Exists() {
if (handle_ != INVALID_HANDLE_VALUE || IsDirectory()) {
#endif
File::FileInfo info;
return File::getFileInfo(filename_.c_str(), &info);
return File::GetFileInfo(filename_.c_str(), &info);
}
return false;
}
bool LocalFileLoader::IsDirectory() {
File::FileInfo info;
if (File::getFileInfo(filename_.c_str(), &info)) {
if (File::GetFileInfo(filename_.c_str(), &info)) {
return info.isDirectory;
}
return false;

2
Core/HLE/Plugins.cpp
View File

@ -83,7 +83,7 @@ static PluginInfo ReadPluginIni(const std::string &subdir, IniFile &ini) {
static std::vector<PluginInfo> FindPlugins(const std::string &gameID, const std::string &lang) {
std::vector<File::FileInfo> pluginDirs;
getFilesInDir(GetSysDirectory(DIRECTORY_PLUGINS).c_str(), &pluginDirs);
GetFilesInDir(GetSysDirectory(DIRECTORY_PLUGINS).c_str(), &pluginDirs);
std::vector<PluginInfo> found;
for (auto subdir : pluginDirs) {

2
GPU/Common/PostShader.cpp
View File

@ -79,7 +79,7 @@ void LoadPostShaderInfo(const std::vector<std::string> &directories) {
for (size_t d = 0; d < directories.size(); d++) {
std::vector<File::FileInfo> fileInfo;
File::getFilesInDir(directories[d].c_str(), &fileInfo, "ini:");
File::GetFilesInDir(directories[d].c_str(), &fileInfo, "ini:");
if (fileInfo.size() == 0) {
VFSGetFileListing(directories[d].c_str(), &fileInfo, "ini:");

12
UI/GameInfoCache.cpp
View File

@ -125,7 +125,7 @@ std::vector<std::string> GameInfo::GetSaveDataDirectories() {
std::string memc = GetSysDirectory(DIRECTORY_SAVEDATA);
std::vector<File::FileInfo> dirs;
File::getFilesInDir(memc.c_str(), &dirs);
File::GetFilesInDir(memc.c_str(), &dirs);
std::vector<std::string> directories;
if (id.size() < 5) {
@ -150,11 +150,11 @@ u64 GameInfo::GetSaveDataSizeInBytes() {
u64 filesSizeInDir = 0;
for (size_t j = 0; j < saveDataDir.size(); j++) {
std::vector<File::FileInfo> fileInfo;
File::getFilesInDir(saveDataDir[j].c_str(), &fileInfo);
File::GetFilesInDir(saveDataDir[j].c_str(), &fileInfo);
// Note: getFileInDir 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);
File::GetFileInfo(fileInfo[i].fullName.c_str(), &finfo);
if (!finfo.isDirectory)
filesSizeInDir += finfo.size;
}
@ -177,11 +177,11 @@ u64 GameInfo::GetInstallDataSizeInBytes() {
u64 filesSizeInDir = 0;
for (size_t j = 0; j < saveDataDir.size(); j++) {
std::vector<File::FileInfo> fileInfo;
File::getFilesInDir(saveDataDir[j].c_str(), &fileInfo);
File::GetFilesInDir(saveDataDir[j].c_str(), &fileInfo);
// Note: getFileInDir 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);
File::GetFileInfo(fileInfo[i].fullName.c_str(), &finfo);
if (!finfo.isDirectory)
filesSizeInDir += finfo.size;
}
@ -231,7 +231,7 @@ bool GameInfo::DeleteAllSaveData() {
std::vector<std::string> saveDataDir = GetSaveDataDirectories();
for (size_t j = 0; j < saveDataDir.size(); j++) {
std::vector<File::FileInfo> fileInfo;
File::getFilesInDir(saveDataDir[j].c_str(), &fileInfo);
File::GetFilesInDir(saveDataDir[j].c_str(), &fileInfo);
for (size_t i = 0; i < fileInfo.size(); i++) {
File::Delete(fileInfo[i].fullName.c_str());

2
UI/GameSettingsScreen.cpp
View File

@ -1773,7 +1773,7 @@ UI::EventReturn DeveloperToolsScreen::OnCopyStatesToRoot(UI::EventParams &e) {
std::string root_dir = GetSysDirectory(DIRECTORY_MEMSTICK_ROOT);
std::vector<File::FileInfo> files;
getFilesInDir(savestate_dir.c_str(), &files, nullptr, 0);
GetFilesInDir(savestate_dir.c_str(), &files, nullptr, 0);
for (const File::FileInfo &file : files) {
std::string src = file.fullName;

2
UI/InstallZipScreen.cpp
View File

@ -29,7 +29,7 @@ void InstallZipScreen::CreateViews() {
using namespace UI;
File::FileInfo fileInfo;
bool success = File::getFileInfo(zipPath_.c_str(), &fileInfo);
bool success = File::GetFileInfo(zipPath_.c_str(), &fileInfo);
auto di = GetI18NCategory("Dialog");
auto iz = GetI18NCategory("InstallZip");

2
UI/SavedataScreen.cpp
View File

@ -489,7 +489,7 @@ void SavedataBrowser::Refresh() {
std::vector<SavedataButton *> savedataButtons;
std::vector<File::FileInfo> fileInfo;
getFilesInDir(path_.c_str(), &fileInfo, "ppst:");
GetFilesInDir(path_.c_str(), &fileInfo, "ppst:");
for (size_t i = 0; i < fileInfo.size(); i++) {
bool isState = !fileInfo[i].isDirectory;

2
Windows/WindowsHost.cpp
View File

@ -274,7 +274,7 @@ static std::string SymbolMapFilename(const char *currentFilename, const char* ex
std::string result = currentFilename;
// can't fail, definitely exists if it gets this far
File::getFileInfo(currentFilename, &info);
File::GetFileInfo(currentFilename, &info);
if (info.isDirectory) {
#ifdef _WIN32
const char* slash = "\\";