From bdd55f034b6917447fae022c46ecb483280df753 Mon Sep 17 00:00:00 2001
From: hui1975 <zhaominghui10@huawei.com>
Date: Mon, 26 Sep 2022 15:01:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=A4=E5=A4=84=E5=A4=9A?=
 =?UTF-8?q?=E4=BD=99=E4=BB=A3=E7=A0=81=E4=BB=A5=E5=8F=8A=E5=A4=9A=E4=BD=99?=
 =?UTF-8?q?=E7=9A=84=E5=8F=B3=E6=8B=AC=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: hui1975 <zhaominghui10@huawei.com>
Change-Id: I9df750adc5f4c4c801b6124a5b2decf1192d51c0
---
 services/sensor/src/sensor_dump.cpp           | 1 -
 services/sensor/src/sensor_suspend_policy.cpp | 2 +-
 utils/src/sensor_basic_data_channel.cpp       | 3 ---
 3 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/services/sensor/src/sensor_dump.cpp b/services/sensor/src/sensor_dump.cpp
index 7ad601c9..d1d298b9 100644
--- a/services/sensor/src/sensor_dump.cpp
+++ b/services/sensor/src/sensor_dump.cpp
@@ -139,7 +139,6 @@ void SensorDump::ParseCommand(int32_t fd, const std::vector<std::string> &args,
         if (strcpy_s(argv[i], args[i].size() + 1, args[i].c_str()) != EOK) {
             SEN_HILOGE("strcpy_s error");
             goto RELEASE_RES;
-            return;
         }
     }
     optind = 1;
diff --git a/services/sensor/src/sensor_suspend_policy.cpp b/services/sensor/src/sensor_suspend_policy.cpp
index 0fe24efa..217e2540 100644
--- a/services/sensor/src/sensor_suspend_policy.cpp
+++ b/services/sensor/src/sensor_suspend_policy.cpp
@@ -168,7 +168,7 @@ void SensorSuspendPolicy::DoActive(const std::shared_ptr<ResourceSchedule::Suspe
             }
             auto ret = EnableSensor(sensorId, appInfo.pid, samplePeriod, maxReportDelay);
             if (ret != ERR_OK) {
-                SEN_HILOGE("sensorId:%{public}u,pid:%{public}d,ret:%{public}d"), sensorId, appInfo.pid, ret);
+                SEN_HILOGE("sensorId:%{public}u,pid:%{public}d,ret:%{public}d", sensorId, appInfo.pid, ret);
             }
         }
     }
diff --git a/utils/src/sensor_basic_data_channel.cpp b/utils/src/sensor_basic_data_channel.cpp
index 6ac276c1..0e7ef077 100755
--- a/utils/src/sensor_basic_data_channel.cpp
+++ b/utils/src/sensor_basic_data_channel.cpp
@@ -174,9 +174,6 @@ int32_t SensorBasicDataChannel::ReceiveData(void *vaddr, size_t size)
     do {
         length = recv(receiveFd_, vaddr, size, MSG_DONTWAIT);
     } while (errno == EINTR);
-    if (length < 0) {
-        return 0;
-    }
     return length;
 }
 
-- 
Gitee