diff options
| author | 2023-02-02 15:53:28 -0500 | |
|---|---|---|
| committer | 2023-02-02 15:53:28 -0500 | |
| commit | b01698775b468a04e4d0a9bdd86035ff00e6decb (patch) | |
| tree | 88f1784fe7833392caeaf713a7a616772f446b18 /src/core/hle/service/filesystem | |
| parent | Merge pull request #9708 from ameerj/gl-context-flush (diff) | |
| download | yuzu-b01698775b468a04e4d0a9bdd86035ff00e6decb.tar.gz yuzu-b01698775b468a04e4d0a9bdd86035ff00e6decb.tar.xz yuzu-b01698775b468a04e4d0a9bdd86035ff00e6decb.zip | |
Revert "hle_ipc: Use std::span to avoid heap allocations/copies when calling ReadBuffer"
Diffstat (limited to 'src/core/hle/service/filesystem')
| -rw-r--r-- | src/core/hle/service/filesystem/fsp_srv.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/core/hle/service/filesystem/fsp_srv.cpp b/src/core/hle/service/filesystem/fsp_srv.cpp index cab44bf9c..fbb16a7da 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 auto data = ctx.ReadBuffer(); | 193 | const std::vector<u8> 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,8 +401,11 @@ public: | |||
| 401 | } | 401 | } |
| 402 | 402 | ||
| 403 | void RenameFile(Kernel::HLERequestContext& ctx) { | 403 | void RenameFile(Kernel::HLERequestContext& ctx) { |
| 404 | const std::string src_name = Common::StringFromBuffer(ctx.ReadBuffer(0)); | 404 | std::vector<u8> buffer = ctx.ReadBuffer(0); |
| 405 | const std::string dst_name = Common::StringFromBuffer(ctx.ReadBuffer(1)); | 405 | const std::string src_name = Common::StringFromBuffer(buffer); |
| 406 | |||
| 407 | buffer = ctx.ReadBuffer(1); | ||
| 408 | const std::string dst_name = Common::StringFromBuffer(buffer); | ||
| 406 | 409 | ||
| 407 | LOG_DEBUG(Service_FS, "called. file '{}' to file '{}'", src_name, dst_name); | 410 | LOG_DEBUG(Service_FS, "called. file '{}' to file '{}'", src_name, dst_name); |
| 408 | 411 | ||