diff options
| author | 2023-02-03 00:08:45 -0500 | |
|---|---|---|
| committer | 2023-02-03 00:08:45 -0500 | |
| commit | 2d2522693e7d453bf10a8246f704350b69e12ebc (patch) | |
| tree | 195584b8f97867628b4d5bc37ecfff5c20655cf9 /src/core/hle/service/filesystem | |
| parent | Merge pull request #9713 from unfamiliarplace/master (diff) | |
| download | yuzu-2d2522693e7d453bf10a8246f704350b69e12ebc.tar.gz yuzu-2d2522693e7d453bf10a8246f704350b69e12ebc.tar.xz yuzu-2d2522693e7d453bf10a8246f704350b69e12ebc.zip | |
Revert "Merge pull request #9718 from yuzu-emu/revert-9508-hle-ipc-buffer-span"
This reverts commit 25fc5c0e1158cb8e81cbc769b24ad84032a1fbfd, reversing
changes made to af20e25081f97d55b451606c87922e2b49f0d363.
Diffstat (limited to 'src/core/hle/service/filesystem')
| -rw-r--r-- | src/core/hle/service/filesystem/fsp_srv.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/core/hle/service/filesystem/fsp_srv.cpp b/src/core/hle/service/filesystem/fsp_srv.cpp index fbb16a7da..cab44bf9c 100644 --- a/src/core/hle/service/filesystem/fsp_srv.cpp +++ b/src/core/hle/service/filesystem/fsp_srv.cpp | |||
| @@ -190,7 +190,7 @@ private: | |||
| 190 | return; | 190 | return; |
| 191 | } | 191 | } |
| 192 | 192 | ||
| 193 | const std::vector<u8> data = ctx.ReadBuffer(); | 193 | const auto data = ctx.ReadBuffer(); |
| 194 | 194 | ||
| 195 | ASSERT_MSG( | 195 | ASSERT_MSG( |
| 196 | static_cast<s64>(data.size()) <= length, | 196 | static_cast<s64>(data.size()) <= length, |
| @@ -401,11 +401,8 @@ public: | |||
| 401 | } | 401 | } |
| 402 | 402 | ||
| 403 | void RenameFile(Kernel::HLERequestContext& ctx) { | 403 | void RenameFile(Kernel::HLERequestContext& ctx) { |
| 404 | std::vector<u8> buffer = ctx.ReadBuffer(0); | 404 | const std::string src_name = Common::StringFromBuffer(ctx.ReadBuffer(0)); |
| 405 | const std::string src_name = Common::StringFromBuffer(buffer); | 405 | const std::string dst_name = Common::StringFromBuffer(ctx.ReadBuffer(1)); |
| 406 | |||
| 407 | buffer = ctx.ReadBuffer(1); | ||
| 408 | const std::string dst_name = Common::StringFromBuffer(buffer); | ||
| 409 | 406 | ||
| 410 | LOG_DEBUG(Service_FS, "called. file '{}' to file '{}'", src_name, dst_name); | 407 | LOG_DEBUG(Service_FS, "called. file '{}' to file '{}'", src_name, dst_name); |
| 411 | 408 | ||