From 7cfc41b4c5b623b1ddda0e3f4a2e7d44a96ba652 Mon Sep 17 00:00:00 2001
From: daili <daili12@huawei.com>
Date: Thu, 7 Jul 2022 14:48:58 +0800
Subject: [PATCH] =?UTF-8?q?CSEC=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复若干CSEC问题和rtg_interface接口的Fuzz测试打印频繁问题

Signed-off-by: Dai Li <daili12@huawei.com>
---
 .../innerkits/frameintf/frame_msg_intf.cpp       |  1 -
 interfaces/innerkits/frameintf/rtg_interface.cpp | 16 ++++------------
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/interfaces/innerkits/frameintf/frame_msg_intf.cpp b/interfaces/innerkits/frameintf/frame_msg_intf.cpp
index c2f09bc..f0961a1 100644
--- a/interfaces/innerkits/frameintf/frame_msg_intf.cpp
+++ b/interfaces/innerkits/frameintf/frame_msg_intf.cpp
@@ -131,7 +131,6 @@ void FrameMsgIntf::Stop()
         runner_->Stop();
         runner_ = nullptr;
     }
-    RME_LOGI("stop eventRunner success!");
 }
 } // namespace RME
 } // namespace OHOS
diff --git a/interfaces/innerkits/frameintf/rtg_interface.cpp b/interfaces/innerkits/frameintf/rtg_interface.cpp
index 7b595d3..bbe88bd 100644
--- a/interfaces/innerkits/frameintf/rtg_interface.cpp
+++ b/interfaces/innerkits/frameintf/rtg_interface.cpp
@@ -151,7 +151,7 @@ int AddThreadsToRtg(vector<int> tids, int grpId, int prioType)
         return fd;
     }
     (void)memset_s(&grp_data, sizeof(struct rtg_grp_data), 0, sizeof(struct rtg_grp_data));
-    int num = tids.size();
+    int num = static_cast<int>(tids.size());
     if (num > MAX_TID_NUM) {
         return -1;
     }
@@ -167,12 +167,8 @@ int AddThreadsToRtg(vector<int> tids, int grpId, int prioType)
     }
 
     ret = ioctl(fd, CMD_ID_SET_RTG, &grp_data);
-    if (ret < 0) {
-        RME_LOGE("add rtg grp failed, errno = %{public}d (%{public}s)", errno, strerror(errno));
-    } else if (ret == 0) {
+    if (!ret) {
         RME_LOGI("add rtg grp success");
-    } else {
-        RME_LOGI("add rtg grp failed with %d threads", ret);
     }
     close(fd);
     return ret;
@@ -332,9 +328,7 @@ int EndScene(int grpId)
         return fd;
     }
     ret = ioctl(fd, CMD_ID_END_SCENE, &state_data);
-    if (ret < 0) {
-        RME_LOGE("set EndScene failed, errno = %{public}d (%{public}s)", errno, strerror(errno));
-    } else {
+    if (ret >= 0) {
         RME_LOGI("set EndScene success, get ret %{public}d.", ret);
     }
     close(fd);
@@ -447,9 +441,7 @@ int SearchRtgForTid(int tid)
     (void)memset_s(&search_data, sizeof(struct proc_state_data), 0, sizeof(struct proc_state_data));
     search_data.state_param = tid;
     ret = ioctl(fd, CMD_ID_SEARCH_RTG, &search_data);
-    if (ret < 0) {
-        RME_LOGE("Search tid fail, errno = %{public}d (%{public}s)", errno, strerror(errno));
-    } else {
+    if (ret >= 0) {
         RME_LOGI("Search tid %{public}d success with rtg_grp %{public}d", tid, ret);
     }
     close(fd);
-- 
Gitee