From 101e3087fe57b70eae459b755373d3db1433b36d Mon Sep 17 00:00:00 2001 From: Michael Scire Date: Thu, 30 Sep 2021 22:18:46 -0700 Subject: [PATCH] os: fix AttachTransferMemory return type --- .../include/stratosphere/os/os_transfer_memory_api.hpp | 2 +- libraries/libstratosphere/source/os/os_transfer_memory.cpp | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/libraries/libstratosphere/include/stratosphere/os/os_transfer_memory_api.hpp b/libraries/libstratosphere/include/stratosphere/os/os_transfer_memory_api.hpp index 2891903f1..a5a64c8d0 100644 --- a/libraries/libstratosphere/include/stratosphere/os/os_transfer_memory_api.hpp +++ b/libraries/libstratosphere/include/stratosphere/os/os_transfer_memory_api.hpp @@ -24,7 +24,7 @@ namespace ams::os { Result CreateTransferMemory(TransferMemoryType *tmem, void *address, size_t size, MemoryPermission perm); - Result AttachTransferMemory(TransferMemoryType *tmem, size_t size, Handle handle, bool managed); + void AttachTransferMemory(TransferMemoryType *tmem, size_t size, Handle handle, bool managed); Handle DetachTransferMemory(TransferMemoryType *tmem); void DestroyTransferMemory(TransferMemoryType *tmem); diff --git a/libraries/libstratosphere/source/os/os_transfer_memory.cpp b/libraries/libstratosphere/source/os/os_transfer_memory.cpp index e6f3a4548..43242954e 100644 --- a/libraries/libstratosphere/source/os/os_transfer_memory.cpp +++ b/libraries/libstratosphere/source/os/os_transfer_memory.cpp @@ -68,15 +68,13 @@ namespace ams::os { return ResultSuccess(); } - Result AttachTransferMemory(TransferMemoryType *tmem, size_t size, Handle handle, bool managed) { + void AttachTransferMemory(TransferMemoryType *tmem, size_t size, Handle handle, bool managed) { AMS_ASSERT(size > 0); AMS_ASSERT(util::IsAligned(size, os::MemoryPageSize)); AMS_ASSERT(handle != svc::InvalidHandle); /* Setup the object. */ SetupTransferMemoryType(tmem, size, handle, managed); - - return ResultSuccess(); } Handle DetachTransferMemory(TransferMemoryType *tmem) {