diff options
| author | 2023-07-29 20:43:34 -0400 | |
|---|---|---|
| committer | 2023-08-08 11:09:37 -0400 | |
| commit | 37b278a9a85fb934fa78ce4abf12a2c9df7d7112 (patch) | |
| tree | 7f772ed7cdd56a4b75df1b3873a0a91996567892 /src | |
| parent | ssl: remove ResultVal use (diff) | |
| download | yuzu-37b278a9a85fb934fa78ce4abf12a2c9df7d7112.tar.gz yuzu-37b278a9a85fb934fa78ce4abf12a2c9df7d7112.tar.xz yuzu-37b278a9a85fb934fa78ce4abf12a2c9df7d7112.zip | |
general: fix incorrect conversions
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/hle/service/filesystem/filesystem.cpp | 2 | ||||
| -rw-r--r-- | src/core/hle/service/ldr/ldr.cpp | 2 | ||||
| -rw-r--r-- | src/core/hle/service/ssl/ssl_backend_securetransport.cpp | 4 | ||||
| -rw-r--r-- | 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 | |||
| 57 | return FileSys::ERROR_PATH_NOT_FOUND; | 57 | return FileSys::ERROR_PATH_NOT_FOUND; |
| 58 | } | 58 | } |
| 59 | 59 | ||
| 60 | FileSys::EntryType entry_type; | 60 | FileSys::EntryType entry_type{}; |
| 61 | if (GetEntryType(&entry_type, path) == ResultSuccess) { | 61 | if (GetEntryType(&entry_type, path) == ResultSuccess) { |
| 62 | return FileSys::ERROR_PATH_ALREADY_EXISTS; | 62 | return FileSys::ERROR_PATH_ALREADY_EXISTS; |
| 63 | } | 63 | } |
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: | |||
| 545 | } | 545 | } |
| 546 | 546 | ||
| 547 | // Map memory for the NRO | 547 | // Map memory for the NRO |
| 548 | VAddr map_location; | 548 | VAddr map_location{}; |
| 549 | const auto map_result{MapNro(&map_location, system.ApplicationProcess(), nro_address, | 549 | const auto map_result{MapNro(&map_location, system.ApplicationProcess(), nro_address, |
| 550 | nro_size, bss_address, bss_size, nro_size + bss_size)}; | 550 | nro_size, bss_address, bss_size, nro_size + bss_size)}; |
| 551 | if (map_result != ResultSuccess) { | 551 | 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: | |||
| 104 | } | 104 | } |
| 105 | 105 | ||
| 106 | Result Read(size_t* out_size, std::span<u8> data) override { | 106 | Result Read(size_t* out_size, std::span<u8> data) override { |
| 107 | OSStatus status = SSLRead(context, data.data(), data.size(), &out_size); | 107 | OSStatus status = SSLRead(context, data.data(), data.size(), out_size); |
| 108 | return HandleReturn("SSLRead", out_size, status); | 108 | return HandleReturn("SSLRead", out_size, status); |
| 109 | } | 109 | } |
| 110 | 110 | ||
| 111 | Result Write(size_t* out_size, std::span<const u8> data) override { | 111 | Result Write(size_t* out_size, std::span<const u8> data) override { |
| 112 | OSStatus status = SSLWrite(context, data.data(), data.size(), &out_size); | 112 | OSStatus status = SSLWrite(context, data.data(), data.size(), out_size); |
| 113 | return HandleReturn("SSLWrite", out_size, status); | 113 | return HandleReturn("SSLWrite", out_size, status); |
| 114 | } | 114 | } |
| 115 | 115 | ||
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: | |||
| 697 | 697 | ||
| 698 | IPC::ResponseBuilder rb{ctx, 2, 1}; | 698 | IPC::ResponseBuilder rb{ctx, 2, 1}; |
| 699 | rb.Push(ResultSuccess); | 699 | rb.Push(ResultSuccess); |
| 700 | rb.PushCopyObjects(*vsync_event); | 700 | rb.PushCopyObjects(vsync_event); |
| 701 | } | 701 | } |
| 702 | 702 | ||
| 703 | void ConvertScalingMode(HLERequestContext& ctx) { | 703 | void ConvertScalingMode(HLERequestContext& ctx) { |