Merge pull request #4568 from lioncash/fsp

fsp_srv: Resolve -Wmaybe_uninitialized warning in OpenSaveDataFileSystem()
This commit is contained in:
bunnei 2020-09-02 23:07:03 -04:00 committed by GitHub
commit 38980b2471
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -844,8 +844,7 @@ void FSP_SRV::OpenSaveDataFileSystem(Kernel::HLERequestContext& ctx) {
return; return;
} }
FileSys::StorageId id; FileSys::StorageId id{};
switch (parameters.space_id) { switch (parameters.space_id) {
case FileSys::SaveDataSpaceId::NandUser: case FileSys::SaveDataSpaceId::NandUser:
id = FileSys::StorageId::NandUser; id = FileSys::StorageId::NandUser;
@ -857,6 +856,10 @@ void FSP_SRV::OpenSaveDataFileSystem(Kernel::HLERequestContext& ctx) {
case FileSys::SaveDataSpaceId::NandSystem: case FileSys::SaveDataSpaceId::NandSystem:
id = FileSys::StorageId::NandSystem; id = FileSys::StorageId::NandSystem;
break; break;
case FileSys::SaveDataSpaceId::TemporaryStorage:
case FileSys::SaveDataSpaceId::ProperSystem:
case FileSys::SaveDataSpaceId::SafeMode:
UNREACHABLE();
} }
auto filesystem = auto filesystem =
@ -902,7 +905,14 @@ void FSP_SRV::ReadSaveDataFileSystemExtraDataWithMaskBySaveDataAttribute(
// Stub this to None for now, backend needs an impl to read/write the SaveDataExtraData // Stub this to None for now, backend needs an impl to read/write the SaveDataExtraData
constexpr auto flags = static_cast<u32>(FileSys::SaveDataFlags::None); constexpr auto flags = static_cast<u32>(FileSys::SaveDataFlags::None);
LOG_WARNING(Service_FS, "(STUBBED) called, flags={}", flags); LOG_WARNING(Service_FS,
"(STUBBED) called, flags={}, space_id={}, attribute.title_id={:016X}\n"
"attribute.user_id={:016X}{:016X}, attribute.save_id={:016X}\n"
"attribute.type={}, attribute.rank={}, attribute.index={}",
flags, static_cast<u32>(parameters.space_id), parameters.attribute.title_id,
parameters.attribute.user_id[1], parameters.attribute.user_id[0],
parameters.attribute.save_id, static_cast<u32>(parameters.attribute.type),
static_cast<u32>(parameters.attribute.rank), parameters.attribute.index);
IPC::ResponseBuilder rb{ctx, 3}; IPC::ResponseBuilder rb{ctx, 3};
rb.Push(RESULT_SUCCESS); rb.Push(RESULT_SUCCESS);