From 37b278a9a85fb934fa78ce4abf12a2c9df7d7112 Mon Sep 17 00:00:00 2001 From: Liam Date: Sat, 29 Jul 2023 20:43:34 -0400 Subject: general: fix incorrect conversions --- src/core/hle/service/filesystem/filesystem.cpp | 2 +- src/core/hle/service/ldr/ldr.cpp | 2 +- src/core/hle/service/ssl/ssl_backend_securetransport.cpp | 4 ++-- src/core/hle/service/vi/vi.cpp | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/core/hle/service/filesystem/filesystem.cpp b/src/core/hle/service/filesystem/filesystem.cpp index d9b569789..f59fa7fb1 100644 --- a/src/core/hle/service/filesystem/filesystem.cpp +++ b/src/core/hle/service/filesystem/filesystem.cpp @@ -57,7 +57,7 @@ Result VfsDirectoryServiceWrapper::CreateFile(const std::string& path_, u64 size return FileSys::ERROR_PATH_NOT_FOUND; } - FileSys::EntryType entry_type; + FileSys::EntryType entry_type{}; if (GetEntryType(&entry_type, path) == ResultSuccess) { return FileSys::ERROR_PATH_ALREADY_EXISTS; } diff --git a/src/core/hle/service/ldr/ldr.cpp b/src/core/hle/service/ldr/ldr.cpp index 95c5b7c8e..c73035c77 100644 --- a/src/core/hle/service/ldr/ldr.cpp +++ b/src/core/hle/service/ldr/ldr.cpp @@ -545,7 +545,7 @@ public: } // Map memory for the NRO - VAddr map_location; + VAddr map_location{}; const auto map_result{MapNro(&map_location, system.ApplicationProcess(), nro_address, nro_size, bss_address, bss_size, nro_size + bss_size)}; if (map_result != ResultSuccess) { diff --git a/src/core/hle/service/ssl/ssl_backend_securetransport.cpp b/src/core/hle/service/ssl/ssl_backend_securetransport.cpp index 5f9e6bef7..370678f48 100644 --- a/src/core/hle/service/ssl/ssl_backend_securetransport.cpp +++ b/src/core/hle/service/ssl/ssl_backend_securetransport.cpp @@ -104,12 +104,12 @@ public: } Result Read(size_t* out_size, std::span data) override { - OSStatus status = SSLRead(context, data.data(), data.size(), &out_size); + OSStatus status = SSLRead(context, data.data(), data.size(), out_size); return HandleReturn("SSLRead", out_size, status); } Result Write(size_t* out_size, std::span data) override { - OSStatus status = SSLWrite(context, data.data(), data.size(), &out_size); + OSStatus status = SSLWrite(context, data.data(), data.size(), out_size); return HandleReturn("SSLWrite", out_size, status); } diff --git a/src/core/hle/service/vi/vi.cpp b/src/core/hle/service/vi/vi.cpp index 5998e786e..6bb02393c 100644 --- a/src/core/hle/service/vi/vi.cpp +++ b/src/core/hle/service/vi/vi.cpp @@ -697,7 +697,7 @@ private: IPC::ResponseBuilder rb{ctx, 2, 1}; rb.Push(ResultSuccess); - rb.PushCopyObjects(*vsync_event); + rb.PushCopyObjects(vsync_event); } void ConvertScalingMode(HLERequestContext& ctx) { -- cgit v1.2.3