openharmony/developtools_syscap_codec
1
0
Fork 0
mirror of https://github.com/openharmony/developtools_syscap_codec.git synced 2026-08-27 02:11:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

!669 merge refs/merge-requests/669/head into master

Browse Source 
【轻量级 PR】类型转换问题修复

Created-by: doublelucky
Commit-by: doublelucky
Merged-by: openharmony_ci
Description: 类型转换问题修复

See merge request: openharmony/developtools_syscap_codec!669
This commit is contained in:
openharmony_ci
2026-07-03 12:02:47 +08:00
parent 0de8cc1c9f ea929641c2
commit 8ac759a5f0
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/create_pcid.c
+12 -8
View File
@@ -586,23 +586,27 @@ static int32_t AddHeaderToJsonObj(uint32_t *pcidHeader, uint32_t pcidHeaderLen,
return -1;
}
PCIDHeader *header = (PCIDHeader *)pcidHeader;
PCIDHeader header;
if (memcpy_s(&header, sizeof(header), pcidHeader, sizeof(PCIDHeader)) != 0) {
PRINT_ERR("Error: memcpy_s failed\n");
return -1;
}
// trans system type to string
char *systemType = header->systemType == 0b001 ? "mini" :
(header->systemType == 0b010 ? "small" :
(header->systemType == 0b100 ? "standard" : NULL));
char *systemType = header.systemType == 0b001 ? "mini" :
(header.systemType == 0b010 ? "small" :
(header.systemType == 0b100 ? "standard" : NULL));
if (systemType == NULL) {
PRINT_ERR("prase system type failed.\n");
return -1;
}
// add to json
if (!cJSON_AddNumberToObject(rootObj, "api_version", NtohsInter(header->apiVersion))) {
PRINT_ERR("add api_version(%u) to json object failed.\n", NtohsInter(header->apiVersion));
if (!cJSON_AddNumberToObject(rootObj, "api_version", NtohsInter(header.apiVersion))) {
PRINT_ERR("add api_version(%u) to json object failed.\n", NtohsInter(header.apiVersion));
return -1;
}
if (!cJSON_AddNumberToObject(rootObj, "manufacturer_id", NtohlInter(header->manufacturerID))) {
PRINT_ERR("add manufacturer_id(%u) to json object failed\n", NtohlInter(header->manufacturerID));
if (!cJSON_AddNumberToObject(rootObj, "manufacturer_id", NtohlInter(header.manufacturerID))) {
PRINT_ERR("add manufacturer_id(%u) to json object failed\n", NtohlInter(header.manufacturerID));
return -1;
}
if (!cJSON_AddStringToObject(rootObj, "system_type", systemType)) {