Macintosh-HW/RASCSI
1
0
Fork 0
mirror of https://github.com/akuker/RASCSI.git synced 2024-06-10 17:29:35 +00:00
Code Issues Projects Releases Wiki Activity

Simplify protobuf handling

Browse Source
This commit is contained in:
Uwe Seimet 2023-10-01 17:45:21 +02:00
parent 8bc6b434bc
commit e702ec22bb
4 changed files with 8 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cpp/piscsi/piscsi_core.cpp
View File

@ -350,7 +350,8 @@ bool Piscsi::ExecuteCommand(const CommandContext& context)
break;
case DEVICE_TYPES_INFO:
result.set_allocated_device_types_info(response.GetDeviceTypesInfo(result));
response.GetDeviceTypesInfo(*result.mutable_device_types_info());
result.set_status(true);
context.WriteResult(result);
break;

15
cpp/piscsi/piscsi_response.cpp
View File

@ -57,7 +57,7 @@ void PiscsiResponse::GetDeviceTypeProperties(PbDeviceTypesInfo& device_types_inf
GetDeviceProperties(*device, *type_properties->mutable_properties());
}
void PiscsiResponse::GetAllDeviceTypeProperties(PbDeviceTypesInfo& device_types_info) const
void PiscsiResponse::GetDeviceTypesInfo(PbDeviceTypesInfo& device_types_info) const
{
// Start with 2 instead of 1. 1 was the removed SASI drive type.
int ordinal = 2;
@ -242,17 +242,6 @@ void PiscsiResponse::GetDevicesInfo(const unordered_set<shared_ptr<PrimaryDevice
result.set_status(true);
}
PbDeviceTypesInfo *PiscsiResponse::GetDeviceTypesInfo(PbResult& result) const
{
auto device_types_info = new PbDeviceTypesInfo();
GetAllDeviceTypeProperties(*device_types_info);
result.set_status(true);
return device_types_info;
}
PbServerInfo *PiscsiResponse::GetServerInfo(const unordered_set<shared_ptr<PrimaryDevice>>& devices,
PbResult& result, const unordered_set<int>& reserved_ids, const string& default_folder,
const string& folder_pattern, const string& file_pattern, int scan_depth) const
@ -261,7 +250,7 @@ PbServerInfo *PiscsiResponse::GetServerInfo(const unordered_set<shared_ptr<Prima
GetVersionInfo(*server_info->mutable_version_info());
GetLogLevelInfo(*server_info->mutable_log_level_info());
GetAllDeviceTypeProperties(*server_info->mutable_device_types_info());
GetDeviceTypesInfo(*server_info->mutable_device_types_info());
GetAvailableImages(result, *server_info, default_folder, folder_pattern, file_pattern, scan_depth);
GetNetworkInterfacesInfo(*server_info->mutable_network_interfaces_info());
GetMappingInfo(*server_info->mutable_mapping_info());

3
cpp/piscsi/piscsi_response.h
View File

@ -32,7 +32,7 @@ public:
void GetReservedIds(PbReservedIdsInfo&, const unordered_set<int>&) const;
void GetDevices(const unordered_set<shared_ptr<PrimaryDevice>>&, PbServerInfo&, const string&) const;
void GetDevicesInfo(const unordered_set<shared_ptr<PrimaryDevice>>&, PbResult&, const PbCommand&, const string&) const;
PbDeviceTypesInfo *GetDeviceTypesInfo(PbResult&) const;
void GetDeviceTypesInfo(PbDeviceTypesInfo&) const;
void GetVersionInfo(PbVersionInfo&) const;
PbServerInfo *GetServerInfo(const unordered_set<shared_ptr<PrimaryDevice>>&, PbResult&, const unordered_set<int>&,
const string&, const string&, const string&, int) const;
@ -47,7 +47,6 @@ private:
void GetDeviceProperties(const Device&, PbDeviceProperties&) const;
void GetDevice(const Device&, PbDevice&, const string&) const;
void GetAllDeviceTypeProperties(PbDeviceTypesInfo&) const;
void GetDeviceTypeProperties(PbDeviceTypesInfo&, PbDeviceType) const;
void GetAvailableImages(PbImageFilesInfo&, const string&, const string&, const string&, int) const;
void GetAvailableImages(PbResult& result, PbServerInfo&, const string&, const string&, const string&, int) const;

7
cpp/test/piscsi_response_test.cpp
View File

@ -164,11 +164,10 @@ TEST(PiscsiResponseTest, GetDevicesInfo)
TEST(PiscsiResponseTest, GetDeviceTypesInfo)
{
PiscsiResponse response;
PbResult result;
const auto& info = response.GetDeviceTypesInfo(result);
EXPECT_TRUE(result.status());
EXPECT_EQ(8, info->properties().size());
PbDeviceTypesInfo info;
response.GetDeviceTypesInfo(info);
EXPECT_EQ(8, info.properties().size());
}
TEST(PiscsiResponseTest, GetServerInfo)