diff options
| author | bunnei <bunneidev@gmail.com> | 2016-12-16 06:37:38 +0100 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2016-12-22 05:48:13 +0100 |
| commit | 4fc8b8229ed1d9ea9d20faee7059c898265db6cf (patch) | |
| tree | 45095e416393473fe9721c60edd9a220b2e44dd4 /src/core/hle/service/fs | |
| parent | core: Consolidate core and system state, remove system module & cleanups. (diff) | |
| download | yuzu-4fc8b8229ed1d9ea9d20faee7059c898265db6cf.tar yuzu-4fc8b8229ed1d9ea9d20faee7059c898265db6cf.tar.gz yuzu-4fc8b8229ed1d9ea9d20faee7059c898265db6cf.tar.bz2 yuzu-4fc8b8229ed1d9ea9d20faee7059c898265db6cf.tar.lz yuzu-4fc8b8229ed1d9ea9d20faee7059c898265db6cf.tar.xz yuzu-4fc8b8229ed1d9ea9d20faee7059c898265db6cf.tar.zst yuzu-4fc8b8229ed1d9ea9d20faee7059c898265db6cf.zip | |
Diffstat (limited to 'src/core/hle/service/fs')
| -rw-r--r-- | src/core/hle/service/fs/archive.cpp | 5 | ||||
| -rw-r--r-- | src/core/hle/service/fs/archive.h | 4 |
2 files changed, 3 insertions, 6 deletions
diff --git a/src/core/hle/service/fs/archive.cpp b/src/core/hle/service/fs/archive.cpp index 09205e4b2..6cddc1fdb 100644 --- a/src/core/hle/service/fs/archive.cpp +++ b/src/core/hle/service/fs/archive.cpp @@ -23,7 +23,6 @@ #include "core/file_sys/archive_systemsavedata.h" #include "core/file_sys/directory_backend.h" #include "core/file_sys/file_backend.h" -#include "core/hle/hle.h" #include "core/hle/kernel/client_session.h" #include "core/hle/result.h" #include "core/hle/service/fs/archive.h" @@ -46,9 +45,7 @@ struct hash<Service::FS::ArchiveIdCode> { }; } -/// TODO(Subv): Confirm length of these strings -const std::string SYSTEM_ID = "00000000000000000000000000000000"; -const std::string SDCARD_ID = "00000000000000000000000000000000"; +static constexpr Kernel::Handle INVALID_HANDLE{}; namespace Service { namespace FS { diff --git a/src/core/hle/service/fs/archive.h b/src/core/hle/service/fs/archive.h index 7ba62ede0..0aa373f40 100644 --- a/src/core/hle/service/fs/archive.h +++ b/src/core/hle/service/fs/archive.h @@ -17,9 +17,9 @@ class FileBackend; } /// The unique system identifier hash, also known as ID0 -extern const std::string SYSTEM_ID; +static constexpr char SYSTEM_ID[]{ "00000000000000000000000000000000" }; /// The scrambled SD card CID, also known as ID1 -extern const std::string SDCARD_ID; +static constexpr char SDCARD_ID[]{ "00000000000000000000000000000000" }; namespace Service { namespace FS { |