From fdd83911b2d9912267ef6a2b69a4b9739a7e3564 Mon Sep 17 00:00:00 2001
From: lichao <lichao74@huawei.com>
Date: Sun, 21 Apr 2024 20:54:04 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=96=E7=A0=81=E8=A7=84=E8=8C=83=E6=95=B4?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: lichao <lichao74@huawei.com>
---
 interfaces/inner_api/syscap_interface.c | 29 +++++++++++++------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/interfaces/inner_api/syscap_interface.c b/interfaces/inner_api/syscap_interface.c
index 887d498..8b9749e 100644
--- a/interfaces/inner_api/syscap_interface.c
+++ b/interfaces/inner_api/syscap_interface.c
@@ -57,7 +57,7 @@ typedef struct ProductCompatibilityID {
     uint8_t osSyscap[OS_SYSCAP_BYTES];
 } PCIDMain;
 
-static const char *g_pcidPath = "/system/etc/PCID.sc";
+static const char *g_PCID_PATH = "/system/etc/PCID.sc";
 
 struct FreeAfterDecodeRpcidInfo {
     char *priSyscap;
@@ -89,7 +89,7 @@ bool EncodeOsSyscap(char *output, int len)
         return false;
     }
 
-    ret = GetFileContext(g_pcidPath, &contextBuffer, &bufferLen);
+    ret = GetFileContext(g_PCID_PATH, &contextBuffer, &bufferLen);
     if (ret != 0) {
         PRINT_ERR("GetFileContext failed, input file : /system/etc/PCID.sc\n");
         return false;
@@ -113,7 +113,7 @@ bool EncodePrivateSyscap(char **output, int *outputLen)
     char *outputStr = NULL;
     uint32_t bufferLen;
 
-    ret = GetFileContext(g_pcidPath, &contextBuffer, &bufferLen);
+    ret = GetFileContext(g_PCID_PATH, &contextBuffer, &bufferLen);
     if (ret != 0) {
         PRINT_ERR("GetFileContext failed, input file : /system/etc/PCID.sc\n");
         return false;
@@ -181,18 +181,19 @@ bool DecodeOsSyscap(const char input[PCID_MAIN_BYTES], char (**output)[SINGLE_SY
 
     for (i = 0; i < countOfSyscap; i++) {
         for (j = 0; j < sizeof(g_arraySyscap) / sizeof(SyscapWithNum); j++) {
-            if (g_arraySyscap[j].num == indexOfSyscap[i]) {
-                nRet = strcpy_s(*strSyscap, SINGLE_SYSCAP_LEN, g_arraySyscap[j].str);
-                if (nRet != EOK) {
-                    printf("strcpy_s failed. error = %d\n", nRet);
-                    *outputCnt = 0;
-                    free(strSyscap);
-                    strSyscap = NULL;
-                    return false;
-                }
-                strSyscap++;
-                break;
+            if (g_arraySyscap[j].num != indexOfSyscap[i]) {
+                continue;
             }
+            nRet = strcpy_s(*strSyscap, SINGLE_SYSCAP_LEN, g_arraySyscap[j].str);
+            if (nRet != EOK) {
+                printf("strcpy_s failed. error = %d\n", nRet);
+                *outputCnt = 0;
+                free(strSyscap);
+                strSyscap = NULL;
+                return false;
+            }
+            strSyscap++;
+            break;
         }
     }