diff options
author | Lioncash <mathew1800@gmail.com> | 2018-08-15 11:38:37 +0200 |
---|---|---|
committer | Lioncash <mathew1800@gmail.com> | 2018-08-15 11:52:37 +0200 |
commit | 87d8a9c98626be491e87e4b9fad84b862d8aa0c9 (patch) | |
tree | d242adb55cd5998b6f5ee20462717d6a916bb552 /src/core | |
parent | Merge pull request #1067 from lioncash/init (diff) | |
download | yuzu-87d8a9c98626be491e87e4b9fad84b862d8aa0c9.tar yuzu-87d8a9c98626be491e87e4b9fad84b862d8aa0c9.tar.gz yuzu-87d8a9c98626be491e87e4b9fad84b862d8aa0c9.tar.bz2 yuzu-87d8a9c98626be491e87e4b9fad84b862d8aa0c9.tar.lz yuzu-87d8a9c98626be491e87e4b9fad84b862d8aa0c9.tar.xz yuzu-87d8a9c98626be491e87e4b9fad84b862d8aa0c9.tar.zst yuzu-87d8a9c98626be491e87e4b9fad84b862d8aa0c9.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/file_sys/card_image.cpp | 7 | ||||
-rw-r--r-- | src/core/loader/loader.cpp | 12 | ||||
-rw-r--r-- | src/core/loader/loader.h | 4 |
3 files changed, 11 insertions, 12 deletions
diff --git a/src/core/file_sys/card_image.cpp b/src/core/file_sys/card_image.cpp index 8e05b9d0e..060948f9e 100644 --- a/src/core/file_sys/card_image.cpp +++ b/src/core/file_sys/card_image.cpp @@ -4,11 +4,14 @@ #include <array> #include <string> -#include <core/loader/loader.h> + +#include <fmt/ostream.h> + #include "common/logging/log.h" #include "core/file_sys/card_image.h" #include "core/file_sys/partition_filesystem.h" #include "core/file_sys/vfs_offset.h" +#include "core/loader/loader.h" namespace FileSys { @@ -142,7 +145,7 @@ Loader::ResultStatus XCI::AddNCAFromPartition(XCIPartition part) { const u16 error_id = static_cast<u16>(nca->GetStatus()); LOG_CRITICAL(Loader, "Could not load NCA {}/{}, failed with error code {:04X} ({})", partition_names[static_cast<size_t>(part)], nca->GetName(), error_id, - Loader::GetMessageForResultStatus(nca->GetStatus())); + nca->GetStatus()); } } diff --git a/src/core/loader/loader.cpp b/src/core/loader/loader.cpp index b143f043c..5e07a3f10 100644 --- a/src/core/loader/loader.cpp +++ b/src/core/loader/loader.cpp @@ -3,6 +3,7 @@ // Refer to the license.txt file included. #include <memory> +#include <ostream> #include <string> #include "common/logging/log.h" #include "common/string_util.h" @@ -119,14 +120,9 @@ constexpr std::array<const char*, 36> RESULT_MESSAGES{ "There is no control data available.", }; -std::string GetMessageForResultStatus(ResultStatus status) { - return GetMessageForResultStatus(static_cast<u16>(status)); -} - -std::string GetMessageForResultStatus(u16 status) { - if (status >= 36) - return ""; - return RESULT_MESSAGES[status]; +std::ostream& operator<<(std::ostream& os, ResultStatus status) { + os << RESULT_MESSAGES.at(static_cast<size_t>(status)); + return os; } /** diff --git a/src/core/loader/loader.h b/src/core/loader/loader.h index 6dffe451a..b74cfbf8a 100644 --- a/src/core/loader/loader.h +++ b/src/core/loader/loader.h @@ -5,6 +5,7 @@ #pragma once #include <algorithm> +#include <iosfwd> #include <memory> #include <string> #include <utility> @@ -94,8 +95,7 @@ enum class ResultStatus : u16 { ErrorNoControl, }; -std::string GetMessageForResultStatus(ResultStatus status); -std::string GetMessageForResultStatus(u16 status); +std::ostream& operator<<(std::ostream& os, ResultStatus status); /// Interface for loading an application class AppLoader : NonCopyable { |