From fa98bf94347e020f21972220167b2ca5d100d7d5 Mon Sep 17 00:00:00 2001 From: Michael Scire Date: Tue, 22 Mar 2022 01:00:39 -0700 Subject: [PATCH] libstrat: misc fixes for unused arg warnings --- .../stratosphere/fssrv/impl/fssrv_external_key_manager.hpp | 2 ++ .../include/stratosphere/gc/impl/gc_embedded_data_holder.hpp | 1 + .../include/stratosphere/ncm/ncm_mapped_memory.hpp | 1 + 3 files changed, 4 insertions(+) diff --git a/libraries/libstratosphere/include/stratosphere/fssrv/impl/fssrv_external_key_manager.hpp b/libraries/libstratosphere/include/stratosphere/fssrv/impl/fssrv_external_key_manager.hpp index a4918709b..a4ee937e9 100644 --- a/libraries/libstratosphere/include/stratosphere/fssrv/impl/fssrv_external_key_manager.hpp +++ b/libraries/libstratosphere/include/stratosphere/fssrv/impl/fssrv_external_key_manager.hpp @@ -37,6 +37,8 @@ namespace ams::fssrv::impl { bool Contains(const void *key, size_t key_size) const { AMS_ASSERT(key_size == sizeof(spl::AccessKey)); + AMS_UNUSED(key_size); + return crypto::IsSameBytes(std::addressof(m_access_key), key, sizeof(m_access_key)); } diff --git a/libraries/libstratosphere/include/stratosphere/gc/impl/gc_embedded_data_holder.hpp b/libraries/libstratosphere/include/stratosphere/gc/impl/gc_embedded_data_holder.hpp index 5d2cbb483..30201f3d7 100644 --- a/libraries/libstratosphere/include/stratosphere/gc/impl/gc_embedded_data_holder.hpp +++ b/libraries/libstratosphere/include/stratosphere/gc/impl/gc_embedded_data_holder.hpp @@ -48,6 +48,7 @@ namespace ams::gc::impl { static void SetLibraryTitleKeyKek(size_t kek_index, const void *kek, size_t kek_size) { AMS_ASSERT(kek_index < GcCrypto::GcTitleKeyKekIndexMax); AMS_ASSERT(kek_size == GcCrypto::GcAesKeyLength); + AMS_UNUSED(kek_size); std::memcpy(s_titlekey_keks[kek_index], kek, sizeof(s_titlekey_keks[kek_index])); } diff --git a/libraries/libstratosphere/include/stratosphere/ncm/ncm_mapped_memory.hpp b/libraries/libstratosphere/include/stratosphere/ncm/ncm_mapped_memory.hpp index 021dd12ae..7523206a3 100644 --- a/libraries/libstratosphere/include/stratosphere/ncm/ncm_mapped_memory.hpp +++ b/libraries/libstratosphere/include/stratosphere/ncm/ncm_mapped_memory.hpp @@ -31,6 +31,7 @@ namespace ams::ncm { u8 *GetBuffer(size_t o, size_t sz) const { AMS_ASSERT(this->buffer != nullptr); AMS_ASSERT(this->IsIncluded(o, sz)); + AMS_UNUSED(sz); return this->buffer + (o - this->offset); }