Review fixes + other stuff

src/core/file_sys/content_archive.cpp

@@ -17,7 +17,10 @@ constexpr u64 SECTION_HEADER_OFFSET = 0x400;
 
 constexpr u32 IVFC_MAX_LEVEL = 6;
 
-enum class NCASectionFilesystemType : u8 { PFS0 = 0x2, ROMFS = 0x3 };
+enum class NCASectionFilesystemType : u8 {
+    PFS0 = 0x2,
+    ROMFS = 0x3,
+};
 
 struct NCASectionHeaderBlock {
     INSERT_PADDING_BYTES(3);

src/core/file_sys/content_archive.h

@@ -11,7 +11,13 @@
 
 namespace FileSys {
 
-enum class NCAContentType : u8 { Program = 0, Meta = 1, Control = 2, Manual = 3, Data = 4 };
+enum class NCAContentType : u8 {
+    Program = 0,
+    Meta = 1,
+    Control = 2,
+    Manual = 3,
+    Data = 4,
+};
 
 struct NCASectionTableEntry {
     u32_le media_offset;
@@ -42,12 +48,12 @@ struct NCAHeader {
 };
 static_assert(sizeof(NCAHeader) == 0x400, "NCAHeader has incorrect size.");
 
-static bool IsDirectoryExeFS(std::shared_ptr<FileSys::VfsDirectory> pfs) {
+inline bool IsDirectoryExeFS(std::shared_ptr<FileSys::VfsDirectory> pfs) {
     // According to switchbrew, an exefs must only contain these two files:
     return pfs->GetFile("main") != nullptr && pfs->GetFile("main.npdm") != nullptr;
 }
 
-static bool IsValidNCA(const NCAHeader& header) {
+inline bool IsValidNCA(const NCAHeader& header) {
     return header.magic == Common::MakeMagic('N', 'C', 'A', '2') ||
            header.magic == Common::MakeMagic('N', 'C', 'A', '3');
 }

src/core/file_sys/errors.h

@@ -11,7 +11,7 @@ namespace FileSys {
 namespace ErrCodes {
 enum {
     NotFound = 1,
-    SaveDataNotFound = 1002,
+    TitleNotFound = 1002,
     SdCardNotFound = 2001,
     RomFSNotFound = 2520,
 };

src/core/file_sys/vfs.cpp

@@ -55,10 +55,10 @@ std::shared_ptr<VfsFile> VfsDirectory::GetFileRelative(const std::string& path)
     if (vec.size() == 1)
         return GetFile(vec[0]);
     auto dir = GetSubdirectory(vec[0]);
-    for (size_t i = 1; i < vec.size() - 1; ++i) {
+    for (size_t component = 1; component < vec.size() - 1; ++component) {
         if (dir == nullptr)
             return nullptr;
-        dir = dir->GetSubdirectory(vec[i]);
+        dir = dir->GetSubdirectory(vec[component]);
     }
     if (dir == nullptr)
         return nullptr;
@@ -77,13 +77,14 @@ std::shared_ptr<VfsDirectory> VfsDirectory::GetDirectoryRelative(const std::stri
     vec.erase(std::remove_if(vec.begin(), vec.end(), [](const auto& str) { return str.empty(); }),
               vec.end());
     if (vec.empty())
-        // return std::shared_ptr<VfsDirectory>(this);
+        // TODO(DarkLordZach): Return this directory if path is '/' or similar. Can't currently
+        // because of const-ness
         return nullptr;
     auto dir = GetSubdirectory(vec[0]);
-    for (size_t i = 1; i < vec.size(); ++i) {
+    for (size_t component = 1; component < vec.size(); ++component) {
         if (dir == nullptr)
             return nullptr;
-        dir = dir->GetSubdirectory(vec[i]);
+        dir = dir->GetSubdirectory(vec[component]);
     }
     return dir;
 }

src/core/file_sys/vfs_real.cpp

@@ -88,20 +88,19 @@ RealVfsDirectory::RealVfsDirectory(const std::string& path_, Mode perms_)
     if (!FileUtil::Exists(path) && (perms == Mode::Write || perms == Mode::Append))
         FileUtil::CreateDir(path);
     unsigned size;
-    if (perms != Mode::Append) {
-        FileUtil::ForeachDirectoryEntry(
-            &size, path,
-            [this](unsigned* entries_out, const std::string& directory,
-                   const std::string& filename) {
-                std::string full_path = directory + DIR_SEP + filename;
-                if (FileUtil::IsDirectory(full_path))
-                    subdirectories.emplace_back(
-                        std::make_shared<RealVfsDirectory>(full_path, perms));
-                else
-                    files.emplace_back(std::make_shared<RealVfsFile>(full_path, perms));
-                return true;
-            });
-    }
+    if (perms == Mode::Append)
+        return;
+
+    FileUtil::ForeachDirectoryEntry(
+        &size, path,
+        [this](unsigned* entries_out, const std::string& directory, const std::string& filename) {
+            std::string full_path = directory + DIR_SEP + filename;
+            if (FileUtil::IsDirectory(full_path))
+                subdirectories.emplace_back(std::make_shared<RealVfsDirectory>(full_path, perms));
+            else
+                files.emplace_back(std::make_shared<RealVfsFile>(full_path, perms));
+            return true;
+        });
 }
 
 std::vector<std::shared_ptr<VfsFile>> RealVfsDirectory::GetFiles() const {
@@ -154,7 +153,7 @@ bool RealVfsDirectory::DeleteFile(const std::string& name) {
     if (file == nullptr)
         return false;
     files.erase(std::find(files.begin(), files.end(), file));
-    auto real_file = dynamic_cast<RealVfsFile*>(file.get());
+    auto real_file = std::static_pointer_cast<RealVfsFile>(file);
     real_file->Close();
     return FileUtil::Delete(path + DIR_SEP + name);
 }