From 40653a66073a180fc4036aed0721cd3741911cfb Mon Sep 17 00:00:00 2001 From: JosJuice Date: Sat, 6 May 2017 17:51:50 +0200 Subject: [PATCH] NandPaths: Make .h function order match .cpp --- Source/Core/Common/NandPaths.cpp | 10 +++++----- Source/Core/Common/NandPaths.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Source/Core/Common/NandPaths.cpp b/Source/Core/Common/NandPaths.cpp index 22afa30c7c..5afa5ef3f1 100644 --- a/Source/Core/Common/NandPaths.cpp +++ b/Source/Core/Common/NandPaths.cpp @@ -47,16 +47,16 @@ std::string GetTitleDataPath(u64 _titleID, FromWhichRoot from) return GetTitlePath(_titleID, from) + "data/"; } -std::string GetTMDFileName(u64 _titleID, FromWhichRoot from) -{ - return GetTitleContentPath(_titleID, from) + "title.tmd"; -} - std::string GetTitleContentPath(u64 _titleID, FromWhichRoot from) { return GetTitlePath(_titleID, from) + "content/"; } +std::string GetTMDFileName(u64 _titleID, FromWhichRoot from) +{ + return GetTitleContentPath(_titleID, from) + "title.tmd"; +} + std::string EscapeFileName(const std::string& filename) { // Prevent paths from containing special names like ., .., ..., ...., and so on diff --git a/Source/Core/Common/NandPaths.h b/Source/Core/Common/NandPaths.h index e71fc34a5e..87c7e8b50c 100644 --- a/Source/Core/Common/NandPaths.h +++ b/Source/Core/Common/NandPaths.h @@ -27,10 +27,10 @@ std::string RootUserPath(FromWhichRoot from); std::string GetImportTitlePath(u64 title_id, FromWhichRoot from = FROM_SESSION_ROOT); std::string GetTicketFileName(u64 _titleID, FromWhichRoot from); -std::string GetTMDFileName(u64 _titleID, FromWhichRoot from); std::string GetTitlePath(u64 title_id, FromWhichRoot from); std::string GetTitleDataPath(u64 _titleID, FromWhichRoot from); std::string GetTitleContentPath(u64 _titleID, FromWhichRoot from); +std::string GetTMDFileName(u64 _titleID, FromWhichRoot from); // Escapes characters that are invalid or have special meanings in the host file system std::string EscapeFileName(const std::string& filename);