From fbbedf3e70b2c33cc4c1ec034bf5a8d29eb6af0c Mon Sep 17 00:00:00 2001
From: chen0088 <chenmenghuan3@huawei.com>
Date: Wed, 18 May 2022 16:05:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0dump?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: chen0088 <chenmenghuan3@huawei.com>
---
 .../src/distributedcamera/dcamera_sink_hidumper.cpp       | 4 ++--
 .../src/distributedcamera/dcamera_source_hidumper.cpp     | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/services/cameraservice/sinkservice/src/distributedcamera/dcamera_sink_hidumper.cpp b/services/cameraservice/sinkservice/src/distributedcamera/dcamera_sink_hidumper.cpp
index 3f61f31..92bcddc 100644
--- a/services/cameraservice/sinkservice/src/distributedcamera/dcamera_sink_hidumper.cpp
+++ b/services/cameraservice/sinkservice/src/distributedcamera/dcamera_sink_hidumper.cpp
@@ -47,7 +47,7 @@ bool DcameraSinkHidumper::Dump(const std::vector<std::string>& args, std::string
     DHLOGI("DcameraSinkHidumper Dump args.size():%d.", args.size());
     result.clear();
     int32_t argsSize = static_cast<int32_t>(args.size());
-    for (int i = 0; i < argsSize; i++) {
+    for (int32_t i = 0; i < argsSize; i++) {
         DHLOGI("DcameraSinkHidumper Dump args[%d]: %s.", i, args.at(i).c_str());
     }
 
@@ -108,7 +108,7 @@ int32_t DcameraSinkHidumper::GetOpenedCameraInfo(std::string& result)
     DHLOGI("GetOpenedCameraInfo Dump.");
     result.append("OpenedCamera\n");
     std::vector<std::string> camIds = camDumpInfo_.camIds;
-    for (int i = 0; i < camIds.size(); i++) {
+    for (size_t i = 0; i < camIds.size(); i++) {
         result.append(camIds[i]);
         result.append("\n");
     }
diff --git a/services/cameraservice/sourceservice/src/distributedcamera/dcamera_source_hidumper.cpp b/services/cameraservice/sourceservice/src/distributedcamera/dcamera_source_hidumper.cpp
index 62b27c9..c8de04e 100644
--- a/services/cameraservice/sourceservice/src/distributedcamera/dcamera_source_hidumper.cpp
+++ b/services/cameraservice/sourceservice/src/distributedcamera/dcamera_source_hidumper.cpp
@@ -60,7 +60,7 @@ bool DcameraSourceHidumper::Dump(const std::vector<std::string>& args, std::stri
     DHLOGI("DcameraSourceHidumper Dump args.size():%d.", args.size());
     result.clear();
     int32_t argsSize = static_cast<int32_t>(args.size());
-    for (int i = 0; i < argsSize; i++) {
+    for (int32_t i = 0; i < argsSize; i++) {
         DHLOGI("DcameraSourceHidumper Dump args[%d]: %s.", i, args.at(i).c_str());
     }
 
@@ -120,15 +120,15 @@ int32_t DcameraSourceHidumper::GetCurrentStateInfo(std::string& result)
 {
     DHLOGI("GetCurrentStateInfo Dump.");
     std::map<std::string, int32_t> devState = camDumpInfo_.curState;
-    std::string deviceId;
-    int32_t camState;
+    std::string deviceId("");
+    int32_t camState = 0;
     for (auto it = devState.begin(); it != devState.end(); it++) {
         deviceId = it->first;
         camState = it->second;
     }
     DHLOGI("GetCurrentStateInfo camState is %d.", camState);
     auto state = STATE_MAP.find(camState);
-    std::string curState;
+    std::string curState("");
     if (state != STATE_MAP.end()) {
         curState = state->second;
     }