ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6690 from lioncash/nand 

Common/NandPaths: Minor cleanup
This commit is contained in:
Mat M 2018-04-28 13:43:33 -04:00 committed by GitHub
parent 6b8da197e8 c1c360d9b1
commit 0cd46f4d21
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,19 +2,16 @@
// Licensed under GPLv2+ // Licensed under GPLv2+
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include "Common/NandPaths.h"
#include <algorithm> #include <algorithm>
#include <string> #include <string>
#include <unordered_set> #include <unordered_set>
#include <utility>
#include <vector> #include <vector>
#include "Common/CommonTypes.h" #include "Common/CommonTypes.h"
#include "Common/File.h"
#include "Common/FileUtil.h" #include "Common/FileUtil.h"
#include "Common/Logging/Log.h"
#include "Common/NandPaths.h"
#include "Common/StringUtil.h" #include "Common/StringUtil.h"
#include "Common/Swap.h"
namespace Common namespace Common
{ {
@ -31,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)
@ -43,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)

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

@ -5,8 +5,6 @@
#pragma once #pragma once
#include <string> #include <string>
#include <utility>
#include <vector>
#include "Common/CommonTypes.h" #include "Common/CommonTypes.h"
@ -23,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);

1
Source/Core/Core/HW/GCMemcard/GCMemcard.h
View File

@ -6,6 +6,7 @@
#include <algorithm> #include <algorithm>
#include <string> #include <string>
#include <vector>
#include "Common/CommonTypes.h" #include "Common/CommonTypes.h"
#include "Common/NandPaths.h" #include "Common/NandPaths.h"