From 5bfddb8c9df36c9d788c44eb2214948498c04fb5 Mon Sep 17 00:00:00 2001
From: fangJinliang1 <fangjinliang1@huawei.com>
Date: Fri, 28 Oct 2022 20:01:26 +0800
Subject: [PATCH] fixed f6a4358 from
 https://gitee.com/fangJinliang1/notification_ans_standard/pulls/706 static
 check modify

Signed-off-by: fangJinliang1 <fangjinliang1@huawei.com>
Change-Id: I7aab026f473be3951545fd8afbc7d7ec2c844d14
---
 frameworks/ans/src/notification.cpp                     | 2 +-
 frameworks/ans/src/notification_distributed_options.cpp | 4 ++--
 frameworks/js/napi/src/reminder/publish.cpp             | 2 +-
 frameworks/js/napi/src/reminder/reminder_common.cpp     | 3 +--
 frameworks/js/napi/src/subscribe.cpp                    | 2 +-
 services/ans/src/advanced_notification_service.cpp      | 2 +-
 6 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/frameworks/ans/src/notification.cpp b/frameworks/ans/src/notification.cpp
index f368a78c2..af1ca979b 100644
--- a/frameworks/ans/src/notification.cpp
+++ b/frameworks/ans/src/notification.cpp
@@ -486,7 +486,7 @@ void Notification::SetSourceType(NotificationConstant::SourceType sourceType)
 std::string Notification::Dump() const
 {
     std::string vibrationStyle = "";
-    for (auto &style : vibrationStyle_) {
+    for (const auto &style : vibrationStyle_) {
         vibrationStyle += std::to_string(style);
         vibrationStyle += ", ";
     }
diff --git a/frameworks/ans/src/notification_distributed_options.cpp b/frameworks/ans/src/notification_distributed_options.cpp
index dbfb26a27..4f6349f67 100644
--- a/frameworks/ans/src/notification_distributed_options.cpp
+++ b/frameworks/ans/src/notification_distributed_options.cpp
@@ -56,13 +56,13 @@ std::vector<std::string> NotificationDistributedOptions::GetDevicesSupportOperat
 std::string NotificationDistributedOptions::Dump()
 {
     std::string devicesSupportDisplay = "";
-    for (auto &device : devicesSupportDisplay_) {
+    for (const auto &device : devicesSupportDisplay_) {
         devicesSupportDisplay += device;
         devicesSupportDisplay += ", ";
     }
 
     std::string devicesSupportOperate = "";
-    for (auto &device : devicesSupportOperate_) {
+    for (const auto &device : devicesSupportOperate_) {
         devicesSupportOperate += device;
         devicesSupportOperate += ", ";
     }
diff --git a/frameworks/js/napi/src/reminder/publish.cpp b/frameworks/js/napi/src/reminder/publish.cpp
index 8a3634270..4d4e65b1b 100644
--- a/frameworks/js/napi/src/reminder/publish.cpp
+++ b/frameworks/js/napi/src/reminder/publish.cpp
@@ -479,7 +479,7 @@ void ParseReminderCalendar(const napi_env &env, const ReminderRequest &reminder,
 }
 
 void ParseReminder(
-    const napi_env &env, const ReminderRequest::ReminderType &type, ReminderRequest &reminder, napi_value &result)
+    const napi_env &env, const ReminderRequest::ReminderType &type, const ReminderRequest &reminder, napi_value &result)
 {
     switch (type) {
         case ReminderRequest::ReminderType::TIMER: {
diff --git a/frameworks/js/napi/src/reminder/reminder_common.cpp b/frameworks/js/napi/src/reminder/reminder_common.cpp
index d1a0afac3..95d0eefdc 100644
--- a/frameworks/js/napi/src/reminder/reminder_common.cpp
+++ b/frameworks/js/napi/src/reminder/reminder_common.cpp
@@ -552,8 +552,7 @@ void ReminderCommon::HandleErrCode(const napi_env &env, int32_t errCode)
     if (errCode == ERR_OK) {
         return;
     }
-    std::string errCodeMsg = FindErrMsg(env, errCode);
-    errCodeMsg = reminderErrCodeMsgMap[errCode];
+    std::string errCodeMsg = reminderErrCodeMsgMap[errCode];
     napi_throw_error(env, std::to_string(errCode).c_str(), errCodeMsg.c_str());
 }
 
diff --git a/frameworks/js/napi/src/subscribe.cpp b/frameworks/js/napi/src/subscribe.cpp
index c128d88c4..86cc4582e 100644
--- a/frameworks/js/napi/src/subscribe.cpp
+++ b/frameworks/js/napi/src/subscribe.cpp
@@ -1038,7 +1038,7 @@ bool AddSubscriberInstancesInfo(const napi_env &env, const SubscriberInstancesIn
     return true;
 }
 
-bool DelSubscriberInstancesInfo(const napi_env &env, SubscriberInstance *subscriber)
+bool DelSubscriberInstancesInfo(const napi_env &env, const SubscriberInstance *subscriber)
 {
     ANS_LOGI("enter");
     if (subscriber == nullptr) {
diff --git a/services/ans/src/advanced_notification_service.cpp b/services/ans/src/advanced_notification_service.cpp
index 05481b8e7..c6d9f465d 100644
--- a/services/ans/src/advanced_notification_service.cpp
+++ b/services/ans/src/advanced_notification_service.cpp
@@ -2095,7 +2095,7 @@ ErrCode AdvancedNotificationService::FlowControl(const std::shared_ptr<Notificat
         } else {
             std::list<std::shared_ptr<NotificationRecord>> sorted = notificationList_;
             sorted.sort(SortNotificationsByLevelAndTime);
-            recordToRemove = bundleList.front();
+            recordToRemove = sorted.front();
             SendFlowControlOccurHiSysEvent(recordToRemove);
             notificationList_.remove(sorted.front());
         }
-- 
Gitee