From 92e71aff5756982bda19356dbcdfe04b19020983 Mon Sep 17 00:00:00 2001 From: Subv Date: Sat, 9 Dec 2017 12:52:27 -0500 Subject: [PATCH] HLE/FS: Use IPCHelper in DeleteDirectoryRecursively. --- src/core/hle/service/fs/fs_user.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/core/hle/service/fs/fs_user.cpp b/src/core/hle/service/fs/fs_user.cpp index 72e930cd3..a72d4c47c 100644 --- a/src/core/hle/service/fs/fs_user.cpp +++ b/src/core/hle/service/fs/fs_user.cpp @@ -272,19 +272,21 @@ static void DeleteDirectory(Service::Interface* self) { * 1 : Result of function, 0 on success, otherwise error code */ static void DeleteDirectoryRecursively(Service::Interface* self) { - u32* cmd_buff = Kernel::GetCommandBuffer(); + IPC::RequestParser rp(Kernel::GetCommandBuffer(), 0x807, 5, 2); - ArchiveHandle archive_handle = MakeArchiveHandle(cmd_buff[2], cmd_buff[3]); - auto dirname_type = static_cast(cmd_buff[4]); - u32 dirname_size = cmd_buff[5]; - u32 dirname_ptr = cmd_buff[7]; + rp.Skip(1, false); // TransactionId + ArchiveHandle archive_handle = rp.PopRaw(); + auto dirname_type = rp.PopEnum(); + u32 dirname_size = rp.Pop(); + u32 dirname_ptr = rp.PopStaticBuffer(nullptr); FileSys::Path dir_path(dirname_type, dirname_size, dirname_ptr); LOG_DEBUG(Service_FS, "type=%u size=%u data=%s", static_cast(dirname_type), dirname_size, dir_path.DebugStr().c_str()); - cmd_buff[1] = DeleteDirectoryRecursivelyFromArchive(archive_handle, dir_path).raw; + IPC::RequestBuilder rb = rp.MakeBuilder(1, 0); + rb.Push(DeleteDirectoryRecursivelyFromArchive(archive_handle, dir_path)); } /*