piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 06:09:50 -06:00
Code Issues Packages Projects Releases Wiki Activity

NandPaths: Make function parameters consistent

Browse Source 
Also drops trailing underscores from said parameter names.
This commit is contained in:
Lioncash
2018-04-22 23:14:23 -04:00
parent 62242331d8
commit c1c360d9b1
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Source/Core/Common/NandPaths.cpp
View File

@ -28,10 +28,10 @@ std::string GetImportTitlePath(u64 title_id, FromWhichRoot from)
static_cast<u32>(title_id)); static_cast<u32>(title_id));
} }
std::string GetTicketFileName(u64 _titleID, FromWhichRoot from) std::string GetTicketFileName(u64 title_id, FromWhichRoot from)
{ {
return StringFromFormat("%s/ticket/%08x/%08x.tik", RootUserPath(from).c_str(), return StringFromFormat("%s/ticket/%08x/%08x.tik", RootUserPath(from).c_str(),
(u32)(_titleID >> 32), (u32)_titleID); static_cast<u32>(title_id >> 32), static_cast<u32>(title_id));
} }
std::string GetTitlePath(u64 title_id, FromWhichRoot from) std::string GetTitlePath(u64 title_id, FromWhichRoot from)
@ -40,19 +40,19 @@ std::string GetTitlePath(u64 title_id, FromWhichRoot from)
static_cast<u32>(title_id >> 32), static_cast<u32>(title_id)); static_cast<u32>(title_id >> 32), static_cast<u32>(title_id));
} }
std::string GetTitleDataPath(u64 _titleID, FromWhichRoot from) std::string GetTitleDataPath(u64 title_id, FromWhichRoot from)
{ {
return GetTitlePath(_titleID, from) + "data/"; return GetTitlePath(title_id, from) + "data/";
} }
std::string GetTitleContentPath(u64 _titleID, FromWhichRoot from) std::string GetTitleContentPath(u64 title_id, FromWhichRoot from)
{ {
return GetTitlePath(_titleID, from) + "content/"; return GetTitlePath(title_id, from) + "content/";
} }
std::string GetTMDFileName(u64 _titleID, FromWhichRoot from) std::string GetTMDFileName(u64 title_id, FromWhichRoot from)
{ {
return GetTitleContentPath(_titleID, from) + "title.tmd"; return GetTitleContentPath(title_id, from) + "title.tmd";
} }
bool IsTitlePath(const std::string& path, FromWhichRoot from, u64* title_id) bool IsTitlePath(const std::string& path, FromWhichRoot from, u64* title_id)

8
Source/Core/Common/NandPaths.h
View File

@ -21,11 +21,11 @@ std::string RootUserPath(FromWhichRoot from);
// Returns /import/%08x/%08x. Intended for use by ES. // Returns /import/%08x/%08x. Intended for use by ES.
std::string GetImportTitlePath(u64 title_id, FromWhichRoot from = FROM_SESSION_ROOT); std::string GetImportTitlePath(u64 title_id, FromWhichRoot from = FROM_SESSION_ROOT);
std::string GetTicketFileName(u64 _titleID, FromWhichRoot from); std::string GetTicketFileName(u64 title_id, FromWhichRoot from);
std::string GetTitlePath(u64 title_id, FromWhichRoot from); std::string GetTitlePath(u64 title_id, FromWhichRoot from);
std::string GetTitleDataPath(u64 _titleID, FromWhichRoot from); std::string GetTitleDataPath(u64 title_id, FromWhichRoot from);
std::string GetTitleContentPath(u64 _titleID, FromWhichRoot from); std::string GetTitleContentPath(u64 title_id, FromWhichRoot from);
std::string GetTMDFileName(u64 _titleID, FromWhichRoot from); std::string GetTMDFileName(u64 title_id, FromWhichRoot from);
// Returns whether a path is within an installed title's directory. // Returns whether a path is within an installed title's directory.
bool IsTitlePath(const std::string& path, FromWhichRoot from, u64* title_id = nullptr); bool IsTitlePath(const std::string& path, FromWhichRoot from, u64* title_id = nullptr);