diff options
Diffstat (limited to 'src/core/file_sys')
| -rw-r--r-- | src/core/file_sys/system_archive/system_archive.cpp | 12 | ||||
| -rw-r--r-- | src/core/file_sys/system_archive/time_zone_binary.cpp | 1 |
2 files changed, 8 insertions, 5 deletions
diff --git a/src/core/file_sys/system_archive/system_archive.cpp b/src/core/file_sys/system_archive/system_archive.cpp index 6abac793b..b53eef877 100644 --- a/src/core/file_sys/system_archive/system_archive.cpp +++ b/src/core/file_sys/system_archive/system_archive.cpp | |||
| @@ -67,25 +67,29 @@ constexpr std::array<SystemArchiveDescriptor, SYSTEM_ARCHIVE_COUNT> SYSTEM_ARCHI | |||
| 67 | }}; | 67 | }}; |
| 68 | 68 | ||
| 69 | VirtualFile SynthesizeSystemArchive(const u64 title_id) { | 69 | VirtualFile SynthesizeSystemArchive(const u64 title_id) { |
| 70 | if (title_id < SYSTEM_ARCHIVES.front().title_id || title_id > SYSTEM_ARCHIVES.back().title_id) | 70 | if (title_id < SYSTEM_ARCHIVES.front().title_id || title_id > SYSTEM_ARCHIVES.back().title_id) { |
| 71 | return nullptr; | 71 | return nullptr; |
| 72 | } | ||
| 72 | 73 | ||
| 73 | const auto& desc = SYSTEM_ARCHIVES[title_id - SYSTEM_ARCHIVE_BASE_TITLE_ID]; | 74 | const auto& desc = SYSTEM_ARCHIVES[title_id - SYSTEM_ARCHIVE_BASE_TITLE_ID]; |
| 74 | 75 | ||
| 75 | LOG_INFO(Service_FS, "Synthesizing system archive '{}' (0x{:016X}).", desc.name, desc.title_id); | 76 | LOG_INFO(Service_FS, "Synthesizing system archive '{}' (0x{:016X}).", desc.name, desc.title_id); |
| 76 | 77 | ||
| 77 | if (desc.supplier == nullptr) | 78 | if (desc.supplier == nullptr) { |
| 78 | return nullptr; | 79 | return nullptr; |
| 80 | } | ||
| 79 | 81 | ||
| 80 | const auto dir = desc.supplier(); | 82 | const auto dir = desc.supplier(); |
| 81 | 83 | ||
| 82 | if (dir == nullptr) | 84 | if (dir == nullptr) { |
| 83 | return nullptr; | 85 | return nullptr; |
| 86 | } | ||
| 84 | 87 | ||
| 85 | const auto romfs = CreateRomFS(dir); | 88 | const auto romfs = CreateRomFS(dir); |
| 86 | 89 | ||
| 87 | if (romfs == nullptr) | 90 | if (romfs == nullptr) { |
| 88 | return nullptr; | 91 | return nullptr; |
| 92 | } | ||
| 89 | 93 | ||
| 90 | LOG_INFO(Service_FS, " - System archive generation successful!"); | 94 | LOG_INFO(Service_FS, " - System archive generation successful!"); |
| 91 | return romfs; | 95 | return romfs; |
diff --git a/src/core/file_sys/system_archive/time_zone_binary.cpp b/src/core/file_sys/system_archive/time_zone_binary.cpp index 7c17bbefa..d4d2eae76 100644 --- a/src/core/file_sys/system_archive/time_zone_binary.cpp +++ b/src/core/file_sys/system_archive/time_zone_binary.cpp | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | #include "common/swap.h" | 6 | #include "common/swap.h" |
| 7 | #include "core/file_sys/system_archive/time_zone_binary.h" | 7 | #include "core/file_sys/system_archive/time_zone_binary.h" |
| 8 | #include "core/file_sys/vfs_vector.h" | 8 | #include "core/file_sys/vfs_vector.h" |
| 9 | #include "core/hle/service/time/time_zone_types.h" | ||
| 10 | 9 | ||
| 11 | #include "nx_tzdb.h" | 10 | #include "nx_tzdb.h" |
| 12 | 11 | ||