From c1c360d9b10a442223d9e09421966137ae53cce3 Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Sun, 22 Apr 2018 23:14:23 -0400
Subject: [PATCH] NandPaths: Make function parameters consistent

Also drops trailing underscores from said parameter names.
---
 Source/Core/Common/NandPaths.cpp | 16 ++++++++--------
 Source/Core/Common/NandPaths.h   |  8 ++++----
 2 files changed, 12 insertions(+), 12 deletions(-)

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<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(),
-                          (u32)(_titleID >> 32), (u32)_titleID);
+                          static_cast<u32>(title_id >> 32), static_cast<u32>(title_id));
 }
 
 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));
 }
 
-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)
diff --git a/Source/Core/Common/NandPaths.h b/Source/Core/Common/NandPaths.h
index 1afa5e619b..5a1dcffce4 100644
--- a/Source/Core/Common/NandPaths.h
+++ b/Source/Core/Common/NandPaths.h
@@ -21,11 +21,11 @@ std::string RootUserPath(FromWhichRoot from);
 // Returns /import/%08x/%08x. Intended for use by ES.
 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 GetTitleDataPath(u64 _titleID, FromWhichRoot from);
-std::string GetTitleContentPath(u64 _titleID, FromWhichRoot from);
-std::string GetTMDFileName(u64 _titleID, FromWhichRoot from);
+std::string GetTitleDataPath(u64 title_id, FromWhichRoot from);
+std::string GetTitleContentPath(u64 title_id, FromWhichRoot from);
+std::string GetTMDFileName(u64 title_id, FromWhichRoot from);
 
 // Returns whether a path is within an installed title's directory.
 bool IsTitlePath(const std::string& path, FromWhichRoot from, u64* title_id = nullptr);