diff options
author | bunnei <bunneidev@gmail.com> | 2016-12-22 17:47:44 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-12-22 17:47:44 +0100 |
commit | aa47af7fb6efd0bda54cca2373ed978e538f6d61 (patch) | |
tree | 93d96872603f64925cd632f27bb5c7046cadeedf /src/core/hle/service/fs | |
parent | Merge pull request #2285 from mailwl/csnd-format (diff) | |
parent | ThreadContext: Move from "core" to "arm_interface". (diff) | |
download | yuzu-aa47af7fb6efd0bda54cca2373ed978e538f6d61.tar yuzu-aa47af7fb6efd0bda54cca2373ed978e538f6d61.tar.gz yuzu-aa47af7fb6efd0bda54cca2373ed978e538f6d61.tar.bz2 yuzu-aa47af7fb6efd0bda54cca2373ed978e538f6d61.tar.lz yuzu-aa47af7fb6efd0bda54cca2373ed978e538f6d61.tar.xz yuzu-aa47af7fb6efd0bda54cca2373ed978e538f6d61.tar.zst yuzu-aa47af7fb6efd0bda54cca2373ed978e538f6d61.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..519c1f3a9 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 { |