diff options
| author | 2019-04-04 21:29:24 -0400 | |
|---|---|---|
| committer | 2019-04-05 11:04:01 -0400 | |
| commit | c05c8a7a065a60f586fe617bf6af0814064eb903 (patch) | |
| tree | c1af6d1714f08cba21f3c1089df5dfcbf55c03b7 /src | |
| parent | service/fsp_srv: Remove unnecessary unknown member in OpenSaveDataFileSystem (diff) | |
| download | yuzu-c05c8a7a065a60f586fe617bf6af0814064eb903.tar.gz yuzu-c05c8a7a065a60f586fe617bf6af0814064eb903.tar.xz yuzu-c05c8a7a065a60f586fe617bf6af0814064eb903.zip | |
service/fsp_srv: Don't pass SaveDataDescriptor instances by value.
Passing around a 64 byte data struct by value is kind of wasteful,
instead pass a reference to the struct.
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/file_sys/savedata_factory.cpp | 2 | ||||
| -rw-r--r-- | src/core/file_sys/savedata_factory.h | 2 | ||||
| -rw-r--r-- | src/core/hle/service/filesystem/filesystem.cpp | 6 | ||||
| -rw-r--r-- | src/core/hle/service/filesystem/filesystem.h | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/src/core/file_sys/savedata_factory.cpp b/src/core/file_sys/savedata_factory.cpp index aba7249b5..7974b031d 100644 --- a/src/core/file_sys/savedata_factory.cpp +++ b/src/core/file_sys/savedata_factory.cpp | |||
| @@ -30,7 +30,7 @@ SaveDataFactory::SaveDataFactory(VirtualDir save_directory) : dir(std::move(save | |||
| 30 | 30 | ||
| 31 | SaveDataFactory::~SaveDataFactory() = default; | 31 | SaveDataFactory::~SaveDataFactory() = default; |
| 32 | 32 | ||
| 33 | ResultVal<VirtualDir> SaveDataFactory::Open(SaveDataSpaceId space, SaveDataDescriptor meta) { | 33 | ResultVal<VirtualDir> SaveDataFactory::Open(SaveDataSpaceId space, const SaveDataDescriptor& meta) { |
| 34 | if (meta.type == SaveDataType::SystemSaveData || meta.type == SaveDataType::SaveData) { | 34 | if (meta.type == SaveDataType::SystemSaveData || meta.type == SaveDataType::SaveData) { |
| 35 | if (meta.zero_1 != 0) { | 35 | if (meta.zero_1 != 0) { |
| 36 | LOG_WARNING(Service_FS, | 36 | LOG_WARNING(Service_FS, |
diff --git a/src/core/file_sys/savedata_factory.h b/src/core/file_sys/savedata_factory.h index 77e93250a..b73654571 100644 --- a/src/core/file_sys/savedata_factory.h +++ b/src/core/file_sys/savedata_factory.h | |||
| @@ -64,7 +64,7 @@ public: | |||
| 64 | explicit SaveDataFactory(VirtualDir dir); | 64 | explicit SaveDataFactory(VirtualDir dir); |
| 65 | ~SaveDataFactory(); | 65 | ~SaveDataFactory(); |
| 66 | 66 | ||
| 67 | ResultVal<VirtualDir> Open(SaveDataSpaceId space, SaveDataDescriptor meta); | 67 | ResultVal<VirtualDir> Open(SaveDataSpaceId space, const SaveDataDescriptor& meta); |
| 68 | 68 | ||
| 69 | VirtualDir GetSaveDataSpaceDirectory(SaveDataSpaceId space) const; | 69 | VirtualDir GetSaveDataSpaceDirectory(SaveDataSpaceId space) const; |
| 70 | 70 | ||
diff --git a/src/core/hle/service/filesystem/filesystem.cpp b/src/core/hle/service/filesystem/filesystem.cpp index c6da2df43..605ec5169 100644 --- a/src/core/hle/service/filesystem/filesystem.cpp +++ b/src/core/hle/service/filesystem/filesystem.cpp | |||
| @@ -319,15 +319,15 @@ ResultVal<FileSys::VirtualFile> OpenRomFS(u64 title_id, FileSys::StorageId stora | |||
| 319 | } | 319 | } |
| 320 | 320 | ||
| 321 | ResultVal<FileSys::VirtualDir> OpenSaveData(FileSys::SaveDataSpaceId space, | 321 | ResultVal<FileSys::VirtualDir> OpenSaveData(FileSys::SaveDataSpaceId space, |
| 322 | FileSys::SaveDataDescriptor save_struct) { | 322 | const FileSys::SaveDataDescriptor& descriptor) { |
| 323 | LOG_TRACE(Service_FS, "Opening Save Data for space_id={:01X}, save_struct={}", | 323 | LOG_TRACE(Service_FS, "Opening Save Data for space_id={:01X}, save_struct={}", |
| 324 | static_cast<u8>(space), save_struct.DebugInfo()); | 324 | static_cast<u8>(space), descriptor.DebugInfo()); |
| 325 | 325 | ||
| 326 | if (save_data_factory == nullptr) { | 326 | if (save_data_factory == nullptr) { |
| 327 | return FileSys::ERROR_ENTITY_NOT_FOUND; | 327 | return FileSys::ERROR_ENTITY_NOT_FOUND; |
| 328 | } | 328 | } |
| 329 | 329 | ||
| 330 | return save_data_factory->Open(space, save_struct); | 330 | return save_data_factory->Open(space, descriptor); |
| 331 | } | 331 | } |
| 332 | 332 | ||
| 333 | ResultVal<FileSys::VirtualDir> OpenSaveDataSpace(FileSys::SaveDataSpaceId space) { | 333 | ResultVal<FileSys::VirtualDir> OpenSaveDataSpace(FileSys::SaveDataSpaceId space) { |
diff --git a/src/core/hle/service/filesystem/filesystem.h b/src/core/hle/service/filesystem/filesystem.h index 6fd5e7b23..7cfc0d902 100644 --- a/src/core/hle/service/filesystem/filesystem.h +++ b/src/core/hle/service/filesystem/filesystem.h | |||
| @@ -46,7 +46,7 @@ ResultVal<FileSys::VirtualFile> OpenRomFSCurrentProcess(); | |||
| 46 | ResultVal<FileSys::VirtualFile> OpenRomFS(u64 title_id, FileSys::StorageId storage_id, | 46 | ResultVal<FileSys::VirtualFile> OpenRomFS(u64 title_id, FileSys::StorageId storage_id, |
| 47 | FileSys::ContentRecordType type); | 47 | FileSys::ContentRecordType type); |
| 48 | ResultVal<FileSys::VirtualDir> OpenSaveData(FileSys::SaveDataSpaceId space, | 48 | ResultVal<FileSys::VirtualDir> OpenSaveData(FileSys::SaveDataSpaceId space, |
| 49 | FileSys::SaveDataDescriptor save_struct); | 49 | const FileSys::SaveDataDescriptor& descriptor); |
| 50 | ResultVal<FileSys::VirtualDir> OpenSaveDataSpace(FileSys::SaveDataSpaceId space); | 50 | ResultVal<FileSys::VirtualDir> OpenSaveDataSpace(FileSys::SaveDataSpaceId space); |
| 51 | ResultVal<FileSys::VirtualDir> OpenSDMC(); | 51 | ResultVal<FileSys::VirtualDir> OpenSDMC(); |
| 52 | 52 | ||