通用规范整改

Signed-off-by: liutuantuan <liutuantuan1@huawei.com>
This commit is contained in:
liutuantuan
2024-07-24 15:26:46 +08:00
parent 592c270eb4
commit 543591b82a
4 changed files with 9 additions and 0 deletions
+1
View File
@@ -652,6 +652,7 @@ int32_t ComparePcidString(const char *pcidString, const char *rpcidString, Compa
&pcidPriSyscapInfo.rpcidPriSyscap, &pcidPriSyscapInfo.rpcidPriSyscapLen);
if (pcidPriSyscapInfo.ret != 0) {
PRINT_ERR("Separate syscap from string failed. ret = %d\n", pcidPriSyscapInfo.ret);
free(pcidPriSyscapInfo.rpcidPriSyscap);
return -1;
}
result->missSyscapNum = 0;
+1
View File
@@ -160,6 +160,7 @@ int32_t CheckRpcidFormat(const char *inputFile, char **buffer, uint32_t *len)
rpcidHeader = (RPCIDHead *)contextBuffer;
if (rpcidHeader->apiVersionType != 1) {
PRINT_ERR("Parse file failed(apiVersionType != 1), input file : %s\n", inputFile);
free(contextBuffer);
return -1;
}
sysCaptype = NtohsInter(*(uint16_t *)(rpcidHeader + 1));
+6
View File
@@ -735,6 +735,12 @@ int32_t DecodeStringPCIDToJson(char *input, char *outDirPath)
PRINT_ERR("Add os syscap json object failed.\n");
goto ADD_JSON_FAILED;
}
if (priSyscapStr == null){
PRINT_ERR("priSyscapStr is null.\n");
goto ADD_JSON_FAILED;
}
if (AddPriSyscapToJsonObj(priSyscapStr, (uint32_t)strlen(priSyscapStr), sysCapObj) != 0) {
PRINT_ERR("Add private syscap json object failed.\n");
goto ADD_JSON_FAILED;
+1
View File
@@ -705,6 +705,7 @@ int32_t ComparePcidWithRpcidString(char *pcidFile, char *rpcidFile, uint32_t typ
&rpcidPriSyscap, &rpcidPriSyscapLen);
if (ret != 0) {
PRINT_ERR("Separate syscap from string failed. ret = %d\n", ret);
free(pcidContent);
return -1;
}