summaryrefslogtreecommitdiff
path: root/Source/Core/DiscIO
diff options
context:
space:
mode:
authorPierre Bourdon <delroth@gmail.com>2014-02-28 23:08:56 +0100
committerPierre Bourdon <delroth@gmail.com>2014-02-28 23:08:56 +0100
commitbc844a168fe54174cd4de04e17ef23849e1fcccb (patch)
tree1293208fb1072c1f13cdf16006190a18a7882dfd /Source/Core/DiscIO
parent1a7e3b3227070fcac6499e6e9eaa8d8ad3ef3e49 (diff)
parent892012dc02d13229e88db1809f7b785fc3516787 (diff)
Merge pull request #100 from Tilka/misc_fixes
Misc fixes
Diffstat (limited to 'Source/Core/DiscIO')
-rw-r--r--Source/Core/DiscIO/NANDContentLoader.cpp2
-rw-r--r--Source/Core/DiscIO/WbfsBlob.cpp7
2 files changed, 4 insertions, 5 deletions
diff --git a/Source/Core/DiscIO/NANDContentLoader.cpp b/Source/Core/DiscIO/NANDContentLoader.cpp
index 1e3be46c70..673c2878d4 100644
--- a/Source/Core/DiscIO/NANDContentLoader.cpp
+++ b/Source/Core/DiscIO/NANDContentLoader.cpp
@@ -374,9 +374,9 @@ void CNANDContentLoader::RemoveTitle() const
// remove tmd?
for (u32 i = 0; i < m_numEntries; i++)
{
- char szFilename[1024];
if (!(m_Content[i].m_Type & 0x8000)) // skip shared apps
{
+ char szFilename[1024];
sprintf(szFilename, "%s%08x.app", Common::GetTitleContentPath(m_TitleID).c_str(), m_Content[i].m_ContentID);
INFO_LOG(DISCIO, "Delete %s", szFilename);
File::Delete(szFilename);
diff --git a/Source/Core/DiscIO/WbfsBlob.cpp b/Source/Core/DiscIO/WbfsBlob.cpp
index b51c14ae9a..4e77d9e959 100644
--- a/Source/Core/DiscIO/WbfsBlob.cpp
+++ b/Source/Core/DiscIO/WbfsBlob.cpp
@@ -14,10 +14,9 @@
namespace DiscIO
{
-const u64 wii_sector_size = 0x8000;
-const u64 wii_sector_count = 143432 * 2;
-const u64 wii_sector_log2 = 15;
-const u64 wii_disc_header_size = 256;
+static const u64 wii_sector_size = 0x8000;
+static const u64 wii_sector_count = 143432 * 2;
+static const u64 wii_disc_header_size = 256;
static inline u64 align(u64 value, u64 bounds)
{