summaryrefslogtreecommitdiffstats
path: root/src/core/hle
diff options
context:
space:
mode:
authorZach Hilman <DarkLordZach@users.noreply.github.com>2019-06-15 22:47:13 +0200
committerGitHub <noreply@github.com>2019-06-15 22:47:13 +0200
commitc140b6ae2ca6bc318f47b74a6946ddb10d282dbe (patch)
tree6407b0465b93a7cfc0a5733e0d8dd3bb26742a15 /src/core/hle
parentMerge pull request #2582 from lioncash/reserved (diff)
parentcommon/hex_util: Reserve std::string memory ahead of time (diff)
downloadyuzu-c140b6ae2ca6bc318f47b74a6946ddb10d282dbe.tar
yuzu-c140b6ae2ca6bc318f47b74a6946ddb10d282dbe.tar.gz
yuzu-c140b6ae2ca6bc318f47b74a6946ddb10d282dbe.tar.bz2
yuzu-c140b6ae2ca6bc318f47b74a6946ddb10d282dbe.tar.lz
yuzu-c140b6ae2ca6bc318f47b74a6946ddb10d282dbe.tar.xz
yuzu-c140b6ae2ca6bc318f47b74a6946ddb10d282dbe.tar.zst
yuzu-c140b6ae2ca6bc318f47b74a6946ddb10d282dbe.zip
Diffstat (limited to 'src/core/hle')
-rw-r--r--src/core/hle/service/am/applets/general_backend.cpp12
-rw-r--r--src/core/hle/service/ldr/ldr.cpp2
2 files changed, 7 insertions, 7 deletions
diff --git a/src/core/hle/service/am/applets/general_backend.cpp b/src/core/hle/service/am/applets/general_backend.cpp
index c591b9ac2..76fc8906d 100644
--- a/src/core/hle/service/am/applets/general_backend.cpp
+++ b/src/core/hle/service/am/applets/general_backend.cpp
@@ -2,7 +2,7 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
-#include <string>
+#include <string_view>
#include "common/assert.h"
#include "common/hex_util.h"
@@ -16,21 +16,21 @@
namespace Service::AM::Applets {
-static void LogCurrentStorage(AppletDataBroker& broker, std::string prefix) {
+static void LogCurrentStorage(AppletDataBroker& broker, std::string_view prefix) {
std::unique_ptr<IStorage> storage = broker.PopNormalDataToApplet();
for (; storage != nullptr; storage = broker.PopNormalDataToApplet()) {
const auto data = storage->GetData();
LOG_INFO(Service_AM,
- "called (STUBBED), during {} recieved normal data with size={:08X}, data={}",
- prefix, data.size(), Common::HexVectorToString(data));
+ "called (STUBBED), during {} received normal data with size={:08X}, data={}",
+ prefix, data.size(), Common::HexToString(data));
}
storage = broker.PopInteractiveDataToApplet();
for (; storage != nullptr; storage = broker.PopInteractiveDataToApplet()) {
const auto data = storage->GetData();
LOG_INFO(Service_AM,
- "called (STUBBED), during {} recieved interactive data with size={:08X}, data={}",
- prefix, data.size(), Common::HexVectorToString(data));
+ "called (STUBBED), during {} received interactive data with size={:08X}, data={}",
+ prefix, data.size(), Common::HexToString(data));
}
}
diff --git a/src/core/hle/service/ldr/ldr.cpp b/src/core/hle/service/ldr/ldr.cpp
index 5af925515..b839303ac 100644
--- a/src/core/hle/service/ldr/ldr.cpp
+++ b/src/core/hle/service/ldr/ldr.cpp
@@ -310,7 +310,7 @@ public:
if (!IsValidNROHash(hash)) {
LOG_ERROR(Service_LDR,
"NRO hash is not present in any currently loaded NRRs (hash={})!",
- Common::HexArrayToString(hash));
+ Common::HexToString(hash));
IPC::ResponseBuilder rb{ctx, 2};
rb.Push(ERROR_MISSING_NRR_HASH);
return;