Skip to content

Commit

Permalink
Merge pull request #5184 from leoetlino/dead-code
Browse files Browse the repository at this point in the history
Common: Remove dead code in NandPaths
  • Loading branch information
lioncash committed Mar 31, 2017
2 parents 6a595aa + e1020cb commit 006381b
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 34 deletions.
32 changes: 0 additions & 32 deletions Source/Core/Common/NandPaths.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -52,38 +52,6 @@ std::string GetTitleContentPath(u64 _titleID, FromWhichRoot from)
(u32)(_titleID >> 32), (u32)_titleID);
}

bool CheckTitleTMD(u64 _titleID, FromWhichRoot from)
{
const std::string TitlePath = GetTMDFileName(_titleID, from);
if (File::Exists(TitlePath))
{
File::IOFile pTMDFile(TitlePath, "rb");
u64 TitleID = 0;
pTMDFile.Seek(0x18C, SEEK_SET);
if (pTMDFile.ReadArray(&TitleID, 1) && _titleID == Common::swap64(TitleID))
return true;
}
INFO_LOG(DISCIO, "Invalid or no tmd for title %08x %08x", (u32)(_titleID >> 32),
(u32)(_titleID & 0xFFFFFFFF));
return false;
}

bool CheckTitleTIK(u64 _titleID, FromWhichRoot from)
{
const std::string ticketFileName = Common::GetTicketFileName(_titleID, from);
if (File::Exists(ticketFileName))
{
File::IOFile pTIKFile(ticketFileName, "rb");
u64 TitleID = 0;
pTIKFile.Seek(0x1dC, SEEK_SET);
if (pTIKFile.ReadArray(&TitleID, 1) && _titleID == Common::swap64(TitleID))
return true;
}
INFO_LOG(DISCIO, "Invalid or no tik for title %08x %08x", (u32)(_titleID >> 32),
(u32)(_titleID & 0xFFFFFFFF));
return false;
}

std::string EscapeFileName(const std::string& filename)
{
// Prevent paths from containing special names like ., .., ..., ...., and so on
Expand Down
2 changes: 0 additions & 2 deletions Source/Core/Common/NandPaths.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@ std::string GetTicketFileName(u64 _titleID, FromWhichRoot from);
std::string GetTMDFileName(u64 _titleID, FromWhichRoot from);
std::string GetTitleDataPath(u64 _titleID, FromWhichRoot from);
std::string GetTitleContentPath(u64 _titleID, FromWhichRoot from);
bool CheckTitleTMD(u64 _titleID, FromWhichRoot from);
bool CheckTitleTIK(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);
Expand Down

0 comments on commit 006381b

Please sign in to comment.