From 8a78326ec4fb36568ee21ae9f188af92bf48d556 Mon Sep 17 00:00:00 2001 From: tongkai0808fh Date: Wed, 22 May 2024 08:26:21 +0000 Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E9=80=80src/syscap=5Ftool.c=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E4=BF=AE=E6=94=B9=20=E5=9B=9E=E9=80=80src/syscap=5Fto?= =?UTF-8?q?ol.c=E6=96=87=E4=BB=B6=E4=BF=AE=E6=94=B9=EF=BC=8C=E5=AE=9A?= =?UTF-8?q?=E4=BD=8Dtdd=E6=B5=8B=E8=AF=95=E5=A4=B1=E8=B4=A5=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: tongkai0808fh --- src/syscap_tool.c | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/src/syscap_tool.c b/src/syscap_tool.c index b00d2b8..e7b1314 100644 --- a/src/syscap_tool.c +++ b/src/syscap_tool.c @@ -474,19 +474,13 @@ int32_t EncodeRpcidscToString(char *inputFile, char *outDirPath) // trans to string format freeAfterEncodeRpcidscInfo.sysCapDefine = CreateWholeSyscapJsonObj(); sysCapArray = cJSON_GetObjectItem(freeAfterEncodeRpcidscInfo.rpcidRoot, "syscap"); - if (sysCapArray == NULL) { - PRINT_ERR("syscap array is null. Input file: %s\n", inputFile); - return FreeAfterEncodeRpcidsc(freeAfterEncodeRpcidscInfo, FREE_WHOLE_SYSCAP_AFTER_RPCIDSC, ret); - } - if (!cJSON_IsArray(sysCapArray)) { + if (sysCapArray == NULL || !cJSON_IsArray(sysCapArray)) { PRINT_ERR("Get syscap failed. Input file: %s\n", inputFile); - sysCapArray = NULL; return FreeAfterEncodeRpcidsc(freeAfterEncodeRpcidscInfo, FREE_WHOLE_SYSCAP_AFTER_RPCIDSC, ret); } sysCapArraySize = cJSON_GetArraySize(sysCapArray); if (sysCapArraySize < 0) { PRINT_ERR("Get syscap size failed. Input file: %s\n", inputFile); - sysCapArray = NULL; return FreeAfterEncodeRpcidsc(freeAfterEncodeRpcidscInfo, FREE_WHOLE_SYSCAP_AFTER_RPCIDSC, ret); } // malloc for save os syscap index @@ -498,7 +492,6 @@ int32_t EncodeRpcidscToString(char *inputFile, char *outDirPath) ret = OutputSetMemAndPrintToFile(freeAfterEncodeRpcidscInfo, sysCapArraySize, sysCapArray, outDirPath); if (freeAfterEncodeRpcidscInfo.flag == 1) { - freeAfterEncodeRpcidscInfo.osSysCapIndex = NULL; return FreeAfterEncodeRpcidsc(freeAfterEncodeRpcidscInfo, freeAfterEncodeRpcidscInfo.type, ret); } return FreeAfterEncodeRpcidsc(freeAfterEncodeRpcidscInfo, FREE_OUTBUFFER_AFTER_RPCIDSC, ret); @@ -506,13 +499,8 @@ int32_t EncodeRpcidscToString(char *inputFile, char *outDirPath) char *CopyInputString(const char *inputString) { - if (inputString == NULL) { - PRINT_ERR("inputString is null.\n"); - return NULL; - } - if (*inputString == '\0') { - PRINT_ERR("inputString is empty.\n"); - inputString = NULL; + if (inputString == NULL || *inputString == '\0') { + PRINT_ERR("inputString is null or empty.\n"); return NULL; } size_t inputLen = strlen(inputString);