From c792eb9a73f820ca47b3542ac5974a959b61b422 Mon Sep 17 00:00:00 2001
From: yudechen <chenyude@huawei.com>
Date: Tue, 7 Jun 2022 20:28:04 +0800
Subject: [PATCH] modify variable name flag to proSysFound.

Change-Id: I917b5e5c96da7d2459046078cf2918d3f2eb65e1
Signed-off-by: yudechen <chenyude@huawei.com>
---
 interfaces/inner_api/syscap_interface.c | 11 ++++++-----
 src/syscap_tool.c                       | 18 ++++++++++--------
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/interfaces/inner_api/syscap_interface.c b/interfaces/inner_api/syscap_interface.c
index 998316a..f5a53ad 100644
--- a/interfaces/inner_api/syscap_interface.c
+++ b/interfaces/inner_api/syscap_interface.c
@@ -601,8 +601,9 @@ bool ComparePcidString(char *pcidString, char *rpcidString)
     int32_t prisyscapFlag = 0;
     char *pcidPriSyscap = NULL;
     char *rpcidPriSyscap = NULL;
+    bool priSysFound;
     uint32_t pcidPriSyscapLen, rpcidPriSyscapLen;
-    uint32_t flag, i, j, temp1, temp2;
+    uint32_t i, j, temp1, temp2;
     uint32_t pcidOsAarry[PCID_OUT_BUFFER] = {0};
     uint32_t rpcidOsAarry[PCID_OUT_BUFFER] = {0};
 
@@ -637,20 +638,20 @@ bool ComparePcidString(char *pcidString, char *rpcidString)
         }
     }
     // compare pri syscap
-    flag = 1;
+    priSysFound = false;
     for (i = 0; i < pcidPriSyscapLen; i++) {
         for (j = 0; j < rpcidPriSyscapLen; j++) {
             if (strcmp(pcidPriSyscap + SINGLE_FEAT_LENGTH * i,
                        rpcidPriSyscap + SINGLE_FEAT_LENGTH * j) == 0) {
-                flag = 0;
+                priSysFound = true;
                 break;
             }
         }
-        if (flag != 0) {
+        if (priSysFound != true) {
             printf("Miss: %s\n", pcidPriSyscap + SINGLE_FEAT_LENGTH * i);
             prisyscapFlag += 1;
         }
-        flag = 1;
+        priSysFound = false;
     }
 
     if (!versionFlag && !ossyscapFlag && !prisyscapFlag) {
diff --git a/src/syscap_tool.c b/src/syscap_tool.c
index 0e84e32..a6be5d3 100644
--- a/src/syscap_tool.c
+++ b/src/syscap_tool.c
@@ -15,6 +15,7 @@
 
 #include <stdio.h>
 #include <stdint.h>
+#include <stdbool.h>
 #include <stdlib.h>
 #include <errno.h>
 #include <unistd.h>
@@ -634,7 +635,8 @@ int32_t ComparePcidWithRpcidString(char *pcidFile, char *rpcidFile)
     char *pcidPriSyscap = NULL;
     char *rpcidPriSyscap = NULL;
     uint32_t pcidContentLen, rpcidContentLen, pcidPriSyscapLen, rpcidPriSyscapLen;
-    uint32_t flag, i, j;
+    uint32_t i, j;
+    bool priSysFound;
     uint32_t pcidOsAarry[PCID_OUT_BUFFER] = {0};
     uint32_t rpcidOsAarry[PCID_OUT_BUFFER] = {0};
 
@@ -666,27 +668,27 @@ int32_t ComparePcidWithRpcidString(char *pcidFile, char *rpcidFile)
         if (!temp2) {
             continue;
         }
-        for (uint8_t j = 0; j < INT_BIT; j++) {
-            if (temp2 & (0x1 << j)) {
+        for (uint8_t k = 0; k < INT_BIT; k++) {
+            if (temp2 & (0x1 << k)) {
                 // 2, header of pcid & rpcid
-                printf("Miss: %s\n", arraySyscap[(i - 2) * INT_BIT + j].syscapStr);
+                printf("Miss: %s\n", arraySyscap[(i - 2) * INT_BIT + k].syscapStr);
             }
         }
     }
     // compare pri syscap
-    flag = 1;
+    priSysFound = false;
     for (i = 0; i < pcidPriSyscapLen; i++) {
         for (j = 0; j < rpcidPriSyscapLen; j++) {
             if (strcmp(pcidPriSyscap + SINGLE_FEAT_LENGTH * i,
                        rpcidPriSyscap + SINGLE_FEAT_LENGTH * j) == 0) {
-                flag = 0;
+                priSysFound = true;
                 break;
             }
         }
-        if (flag != 0) {
+        if (priSysFound != true) {
             printf("Miss: %s\n", pcidPriSyscap + SINGLE_FEAT_LENGTH * i);
         }
-        flag = 1;
+        priSysFound = false;
     }
     return ret;
 }
\ No newline at end of file