From 62242331d865a842687f463eb93c9a10fd505a00 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sun, 22 Apr 2018 23:13:28 -0400 Subject: NandPaths: Remove unused header inclusions --- Source/Core/Common/NandPaths.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'Source/Core/Common/NandPaths.cpp') diff --git a/Source/Core/Common/NandPaths.cpp b/Source/Core/Common/NandPaths.cpp index ec43b38484..5f0bdc34f3 100644 --- a/Source/Core/Common/NandPaths.cpp +++ b/Source/Core/Common/NandPaths.cpp @@ -2,19 +2,16 @@ // Licensed under GPLv2+ // Refer to the license.txt file included. +#include "Common/NandPaths.h" + #include #include #include -#include #include #include "Common/CommonTypes.h" -#include "Common/File.h" #include "Common/FileUtil.h" -#include "Common/Logging/Log.h" -#include "Common/NandPaths.h" #include "Common/StringUtil.h" -#include "Common/Swap.h" namespace Common { -- cgit v1.2.3 From c1c360d9b10a442223d9e09421966137ae53cce3 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sun, 22 Apr 2018 23:14:23 -0400 Subject: NandPaths: Make function parameters consistent Also drops trailing underscores from said parameter names. --- Source/Core/Common/NandPaths.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'Source/Core/Common/NandPaths.cpp') diff --git a/Source/Core/Common/NandPaths.cpp b/Source/Core/Common/NandPaths.cpp index 5f0bdc34f3..b670be635d 100644 --- a/Source/Core/Common/NandPaths.cpp +++ b/Source/Core/Common/NandPaths.cpp @@ -28,10 +28,10 @@ std::string GetImportTitlePath(u64 title_id, FromWhichRoot from) static_cast(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(), - (u32)(_titleID >> 32), (u32)_titleID); + static_cast(title_id >> 32), static_cast(title_id)); } std::string GetTitlePath(u64 title_id, FromWhichRoot from) @@ -40,19 +40,19 @@ std::string GetTitlePath(u64 title_id, FromWhichRoot from) static_cast(title_id >> 32), static_cast(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) -- cgit v1.2.3