summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRodrigo Locatti <reinuseslisp@airmail.cc>2019-10-07 01:35:12 +0200
committerGitHub <noreply@github.com>2019-10-07 01:35:12 +0200
commitdcdd887df3549d41c3fdaf4ad8a20218179039d5 (patch)
treeece0f2275d10663f4b49fe737c6401536d0758c8
parentMerge pull request #2955 from lioncash/allocator (diff)
parentbcat/module: Silence truncation warnings (diff)
downloadyuzu-dcdd887df3549d41c3fdaf4ad8a20218179039d5.tar
yuzu-dcdd887df3549d41c3fdaf4ad8a20218179039d5.tar.gz
yuzu-dcdd887df3549d41c3fdaf4ad8a20218179039d5.tar.bz2
yuzu-dcdd887df3549d41c3fdaf4ad8a20218179039d5.tar.lz
yuzu-dcdd887df3549d41c3fdaf4ad8a20218179039d5.tar.xz
yuzu-dcdd887df3549d41c3fdaf4ad8a20218179039d5.tar.zst
yuzu-dcdd887df3549d41c3fdaf4ad8a20218179039d5.zip
Diffstat (limited to '')
-rw-r--r--src/core/hle/service/bcat/backend/backend.cpp9
-rw-r--r--src/core/hle/service/bcat/backend/backend.h11
-rw-r--r--src/core/hle/service/bcat/backend/boxcat.cpp3
-rw-r--r--src/core/hle/service/bcat/module.cpp6
4 files changed, 17 insertions, 12 deletions
diff --git a/src/core/hle/service/bcat/backend/backend.cpp b/src/core/hle/service/bcat/backend/backend.cpp
index 9b677debe..9d6946bc5 100644
--- a/src/core/hle/service/bcat/backend/backend.cpp
+++ b/src/core/hle/service/bcat/backend/backend.cpp
@@ -10,13 +10,14 @@
namespace Service::BCAT {
-ProgressServiceBackend::ProgressServiceBackend(std::string event_name) : impl{} {
+ProgressServiceBackend::ProgressServiceBackend(std::string_view event_name) {
auto& kernel{Core::System::GetInstance().Kernel()};
event = Kernel::WritableEvent::CreateEventPair(
- kernel, Kernel::ResetType::Automatic, "ProgressServiceBackend:UpdateEvent:" + event_name);
+ kernel, Kernel::ResetType::Automatic,
+ std::string("ProgressServiceBackend:UpdateEvent:").append(event_name));
}
-Kernel::SharedPtr<Kernel::ReadableEvent> ProgressServiceBackend::GetEvent() {
+Kernel::SharedPtr<Kernel::ReadableEvent> ProgressServiceBackend::GetEvent() const {
return event.readable;
}
@@ -95,7 +96,7 @@ Backend::Backend(DirectoryGetter getter) : dir_getter(std::move(getter)) {}
Backend::~Backend() = default;
-NullBackend::NullBackend(const DirectoryGetter& getter) : Backend(std::move(getter)) {}
+NullBackend::NullBackend(DirectoryGetter getter) : Backend(std::move(getter)) {}
NullBackend::~NullBackend() = default;
diff --git a/src/core/hle/service/bcat/backend/backend.h b/src/core/hle/service/bcat/backend/backend.h
index 3f5d8b5dd..51dbd3316 100644
--- a/src/core/hle/service/bcat/backend/backend.h
+++ b/src/core/hle/service/bcat/backend/backend.h
@@ -6,6 +6,9 @@
#include <functional>
#include <optional>
+#include <string>
+#include <string_view>
+
#include "common/common_types.h"
#include "core/file_sys/vfs_types.h"
#include "core/hle/kernel/readable_event.h"
@@ -85,14 +88,14 @@ public:
void FinishDownload(ResultCode result);
private:
- explicit ProgressServiceBackend(std::string event_name);
+ explicit ProgressServiceBackend(std::string_view event_name);
- Kernel::SharedPtr<Kernel::ReadableEvent> GetEvent();
+ Kernel::SharedPtr<Kernel::ReadableEvent> GetEvent() const;
DeliveryCacheProgressImpl& GetImpl();
void SignalUpdate() const;
- DeliveryCacheProgressImpl impl;
+ DeliveryCacheProgressImpl impl{};
Kernel::EventPair event;
bool need_hle_lock = false;
};
@@ -128,7 +131,7 @@ protected:
// A backend of BCAT that provides no operation.
class NullBackend : public Backend {
public:
- explicit NullBackend(const DirectoryGetter& getter);
+ explicit NullBackend(DirectoryGetter getter);
~NullBackend() override;
bool Synchronize(TitleIDVersion title, ProgressServiceBackend& progress) override;
diff --git a/src/core/hle/service/bcat/backend/boxcat.cpp b/src/core/hle/service/bcat/backend/boxcat.cpp
index 0e451e9c2..64022982b 100644
--- a/src/core/hle/service/bcat/backend/boxcat.cpp
+++ b/src/core/hle/service/bcat/backend/boxcat.cpp
@@ -495,7 +495,8 @@ Boxcat::StatusResult Boxcat::GetStatus(std::optional<std::string>& global,
}
return StatusResult::Success;
- } catch (const nlohmann::json::parse_error& e) {
+ } catch (const nlohmann::json::parse_error& error) {
+ LOG_ERROR(Service_BCAT, "{}", error.what());
return StatusResult::ParseError;
}
}
diff --git a/src/core/hle/service/bcat/module.cpp b/src/core/hle/service/bcat/module.cpp
index 4c01bcd99..1f21b0434 100644
--- a/src/core/hle/service/bcat/module.cpp
+++ b/src/core/hle/service/bcat/module.cpp
@@ -451,7 +451,7 @@ private:
IPC::ResponseBuilder rb{ctx, 3};
rb.Push(RESULT_SUCCESS);
- rb.Push<u32>(write_size * sizeof(DeliveryCacheDirectoryEntry));
+ rb.Push(static_cast<u32>(write_size * sizeof(DeliveryCacheDirectoryEntry)));
}
void GetCount(Kernel::HLERequestContext& ctx) {
@@ -468,7 +468,7 @@ private:
IPC::ResponseBuilder rb{ctx, 3};
rb.Push(RESULT_SUCCESS);
- rb.Push<u32>(files.size());
+ rb.Push(static_cast<u32>(files.size()));
}
FileSys::VirtualDir root;
@@ -525,7 +525,7 @@ private:
IPC::ResponseBuilder rb{ctx, 3};
rb.Push(RESULT_SUCCESS);
- rb.Push<u32>(size);
+ rb.Push(static_cast<u32>(size));
}
FileSys::VirtualDir root;