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

修改HWTEST_F(SyscapCodecTest, ComparePcidString, TestSize.Level1)测试用例不通过的问题

Browse Source 
Signed-off-by: lichao <lichao74@huawei.com>
This commit is contained in:
lichao
2024-01-26 21:03:25 +08:00
parent e47f16120c
commit c0da1ce21f
1 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
interfaces/inner_api/syscap_interface.c
+8 -8
View File
@@ -511,7 +511,7 @@ char *DecodeRpcidToStringFormat(const char *inputFile)
return FreeAfterDecodeRpcidToString(freeAfterDecodeRpcidInfo, FREE_MALLOC_PRISYSCAP_AFTER_DECODE_RPCID, outBuffer);
}
static int32_t CopySyscopToRet(struct PcidPriSyscapInfo pcidPriSyscapInfo, const size_t allSyscapNum,
static int32_t CopySyscopToRet(struct PcidPriSyscapInfo *pcidPriSyscapInfo, const size_t allSyscapNum,
char *tempSyscap, uint32_t i, uint8_t k)
{
uint32_t pos = (i - 2) * INT_BIT + k;
@@ -521,15 +521,15 @@ static int32_t CopySyscopToRet(struct PcidPriSyscapInfo pcidPriSyscapInfo, const
break;
}
}
pcidPriSyscapInfo.ret = strcpy_s(tempSyscap, sizeof(char) * SINGLE_SYSCAP_LEN, g_arraySyscap[t].str);
pcidPriSyscapInfo->ret = strcpy_s(tempSyscap, sizeof(char) * SINGLE_SYSCAP_LEN, g_arraySyscap[t].str);
// 2, header of pcid & rpcid
if (pcidPriSyscapInfo.ret != EOK) {
if (pcidPriSyscapInfo->ret != EOK) {
return -1;
}
return 0;
}
static int32_t CheckPcidEachBit(struct PcidPriSyscapInfo pcidPriSyscapInfo, CompareError *result,
static int32_t CheckPcidEachBit(struct PcidPriSyscapInfo *pcidPriSyscapInfo, CompareError *result,
const size_t allSyscapNum, uint32_t i, uint32_t blockBits)
{
int32_t ret = 0;
@@ -547,14 +547,14 @@ static int32_t CheckPcidEachBit(struct PcidPriSyscapInfo pcidPriSyscapInfo, Comp
FreeCompareError(result);
return -1;
}
result->syscap[pcidPriSyscapInfo.ossyscapFlag++] = tempSyscap;
result->syscap[pcidPriSyscapInfo->ossyscapFlag++] = tempSyscap;
}
}
return ret;
}
static int32_t ComparePcidWithOsSyscap(struct PcidPriSyscapInfo pcidPriSyscapInfo,
const uint32_t pcidOsAarry[PCID_OUT_BUFFER], const uint32_t rpcidOsAarry[PCID_OUT_BUFFER], CompareError *result,
static int32_t ComparePcidWithOsSyscap(struct PcidPriSyscapInfo *pcidPriSyscapInfo,
const uint32_t *pcidOsAarry, const uint32_t *rpcidOsAarry, CompareError *result,
const size_t allSyscapNum)
{
uint32_t i;
@@ -652,7 +652,7 @@ int32_t ComparePcidString(const char *pcidString, const char *rpcidString, Compa
}
// compare os sysscap
errorFlag = ComparePcidWithOsSyscap(pcidPriSyscapInfo, pcidOsAarry, rpcidOsAarry, result, allSyscapNum);
errorFlag = ComparePcidWithOsSyscap(&pcidPriSyscapInfo, pcidOsAarry, rpcidOsAarry, result, allSyscapNum);
if (errorFlag == -1) {
return errorFlag;
}