Merge pull request #4247 from lioncash/wad

WiiWad: Minor changes
dolphin-emu · Sep 27, 2016 · 3de4dc2 · 3de4dc2
2 parents f701724 + 61b977c
commit 3de4dc2
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 29 deletions.
diff --git a/Source/Core/DiscIO/WiiWad.cpp b/Source/Core/DiscIO/WiiWad.cpp
@@ -16,23 +16,9 @@
 
 namespace DiscIO
 {
-WiiWAD::WiiWAD(const std::string& name)
-{
-  std::unique_ptr<IBlobReader> reader(CreateBlobReader(name));
-  if (reader == nullptr || File::IsDirectory(name))
-  {
-    m_valid = false;
-    return;
-  }
-
-  m_valid = ParseWAD(*reader);
-}
-
-WiiWAD::~WiiWAD()
+namespace
 {
-}
-
-std::vector<u8> WiiWAD::CreateWADEntry(IBlobReader& reader, u32 size, u64 offset)
+std::vector<u8> CreateWADEntry(IBlobReader& reader, u32 size, u64 offset)
 {
   if (size == 0)
     return {};
@@ -48,6 +34,32 @@ std::vector<u8> WiiWAD::CreateWADEntry(IBlobReader& reader, u32 size, u64 offset
   return buffer;
 }
 
+bool IsWiiWAD(const CBlobBigEndianReader& reader)
+{
+  u32 header_size = 0;
+  u32 header_type = 0;
+  reader.ReadSwapped(0x0, &header_size);
+  reader.ReadSwapped(0x4, &header_type);
+  return header_size == 0x20 && (header_type == 0x49730000 || header_type == 0x69620000);
+}
+}  // Anonymous namespace
+
+WiiWAD::WiiWAD(const std::string& name)
+{
+  std::unique_ptr<IBlobReader> reader(CreateBlobReader(name));
+  if (reader == nullptr || File::IsDirectory(name))
+  {
+    m_valid = false;
+    return;
+  }
+
+  m_valid = ParseWAD(*reader);
+}
+
+WiiWAD::~WiiWAD()
+{
+}
+
 bool WiiWAD::ParseWAD(IBlobReader& reader)
 {
   CBlobBigEndianReader big_endian_reader(reader);
@@ -88,13 +100,4 @@ bool WiiWAD::ParseWAD(IBlobReader& reader)
   return true;
 }
 
-bool WiiWAD::IsWiiWAD(const CBlobBigEndianReader& reader)
-{
-  u32 header_size = 0;
-  u32 header_type = 0;
-  reader.ReadSwapped(0x0, &header_size);
-  reader.ReadSwapped(0x4, &header_type);
-  return header_size == 0x20 && (header_type == 0x49730000 || header_type == 0x69620000);
-}
-
-}  // namespace end
+}  // namespace DiscIO
diff --git a/Source/Core/DiscIO/WiiWad.h b/Source/Core/DiscIO/WiiWad.h
@@ -17,7 +17,7 @@ class CBlobBigEndianReader;
 class WiiWAD
 {
 public:
-  WiiWAD(const std::string& name);
+  explicit WiiWAD(const std::string& name);
   ~WiiWAD();
 
   bool IsValid() const { return m_valid; }
@@ -28,8 +28,6 @@ class WiiWAD
   const std::vector<u8>& GetFooter() const { return m_footer; }
 private:
   bool ParseWAD(IBlobReader& reader);
-  static std::vector<u8> CreateWADEntry(IBlobReader& reader, u32 size, u64 offset);
-  static bool IsWiiWAD(const CBlobBigEndianReader& reader);
 
   bool m_valid;