From 125e2a8ee744119681283a9e8591a8a4cd2a82eb Mon Sep 17 00:00:00 2001
From: zff <zhangfanfan2@huawei.com>
Date: Sat, 26 Mar 2022 20:09:57 +0800
Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3arm64=E9=97=A8?=
 =?UTF-8?q?=E7=A6=81=E7=BC=96=E8=AF=91=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

close: #I4ZQXT

Signed-off-by: zff <zhangfanfan2@huawei.com>
Change-Id: I9067612c65743c5f7921d1f29433967605da2f50
---
 .../distributeddataservice/service/kvdb/user_delegate.cpp     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/services/distributeddataservice/service/kvdb/user_delegate.cpp b/services/distributeddataservice/service/kvdb/user_delegate.cpp
index a1d653e95..45e8692e6 100644
--- a/services/distributeddataservice/service/kvdb/user_delegate.cpp
+++ b/services/distributeddataservice/service/kvdb/user_delegate.cpp
@@ -69,7 +69,7 @@ void UserDelegate::DeleteUsers(const std::string &deviceId)
 
 void UserDelegate::UpdateUsers(const std::string &deviceId, const std::vector<UserStatus> &userStatus)
 {
-    ZLOGI("begin, device:%{public}.10s, users:%{public}u", deviceId.c_str(), userStatus.size());
+    ZLOGI("begin, device:%{public}.10s, users:%{public}lu", deviceId.c_str(), (unsigned long)userStatus.size());
     deviceUserMap_.ComputeIfPresent(deviceId, [](const auto &key, std::map<int, bool> &userMap) {
         for (auto &user : userMap) {
             user.second = false;
@@ -78,7 +78,7 @@ void UserDelegate::UpdateUsers(const std::string &deviceId, const std::vector<Us
     for (auto &user : userStatus) {
         deviceUserMap_[deviceId][user.id] = user.isActive;
     }
-    ZLOGI("end, device:%{public}.10s, users:%{public}u", deviceId.c_str(), deviceUserMap_[deviceId].size());
+    ZLOGI("end, device:%{public}.10s, users:%{public}lu", deviceId.c_str(), (unsigned long)deviceUserMap_[deviceId].size());
 }
 
 bool UserDelegate::InitLocalUserMeta()
-- 
Gitee


From 63ecf4459463b2dac1920bc7d223e87e2e05e615 Mon Sep 17 00:00:00 2001
From: zhangfanfan2 <zhangfanfan2@huawei.com>
Date: Sat, 26 Mar 2022 14:56:32 +0000
Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3arm64=E9=97=A8?=
 =?UTF-8?q?=E7=A6=81=E7=BC=96=E8=AF=91=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

close: #I4ZQXT

Signed-off-by: zff <zhangfanfan2@huawei.com>
---
 services/distributeddataservice/service/kvdb/user_delegate.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/services/distributeddataservice/service/kvdb/user_delegate.cpp b/services/distributeddataservice/service/kvdb/user_delegate.cpp
index 45e8692e6..1f10f2754 100644
--- a/services/distributeddataservice/service/kvdb/user_delegate.cpp
+++ b/services/distributeddataservice/service/kvdb/user_delegate.cpp
@@ -78,7 +78,8 @@ void UserDelegate::UpdateUsers(const std::string &deviceId, const std::vector<Us
     for (auto &user : userStatus) {
         deviceUserMap_[deviceId][user.id] = user.isActive;
     }
-    ZLOGI("end, device:%{public}.10s, users:%{public}lu", deviceId.c_str(), (unsigned long)deviceUserMap_[deviceId].size());
+    ZLOGI("end, device:%{public}.10s, users:%{public}lu", deviceId.c_str(),
+          (unsigned long)deviceUserMap_[deviceId].size());
 }
 
 bool UserDelegate::InitLocalUserMeta()
-- 
Gitee


From 60e236c1414c57fb2d6ddaabbac90ddf4a342fa1 Mon Sep 17 00:00:00 2001
From: zhangfanfan2 <zhangfanfan2@huawei.com>
Date: Mon, 28 Mar 2022 02:32:03 +0000
Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3arm64=E9=97=A8?=
 =?UTF-8?q?=E7=A6=81=E7=BC=96=E8=AF=91=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

close: #I4ZQXT

Signed-off-by: zff <zhangfanfan2@huawei.com>
---
 .../distributeddataservice/service/kvdb/user_delegate.cpp   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/services/distributeddataservice/service/kvdb/user_delegate.cpp b/services/distributeddataservice/service/kvdb/user_delegate.cpp
index 1f10f2754..962561907 100644
--- a/services/distributeddataservice/service/kvdb/user_delegate.cpp
+++ b/services/distributeddataservice/service/kvdb/user_delegate.cpp
@@ -69,7 +69,7 @@ void UserDelegate::DeleteUsers(const std::string &deviceId)
 
 void UserDelegate::UpdateUsers(const std::string &deviceId, const std::vector<UserStatus> &userStatus)
 {
-    ZLOGI("begin, device:%{public}.10s, users:%{public}lu", deviceId.c_str(), (unsigned long)userStatus.size());
+    ZLOGI("begin, device:%{public}.10s, users:%{public}zu", deviceId.c_str(), userStatus.size());
     deviceUserMap_.ComputeIfPresent(deviceId, [](const auto &key, std::map<int, bool> &userMap) {
         for (auto &user : userMap) {
             user.second = false;
@@ -78,8 +78,8 @@ void UserDelegate::UpdateUsers(const std::string &deviceId, const std::vector<Us
     for (auto &user : userStatus) {
         deviceUserMap_[deviceId][user.id] = user.isActive;
     }
-    ZLOGI("end, device:%{public}.10s, users:%{public}lu", deviceId.c_str(),
-          (unsigned long)deviceUserMap_[deviceId].size());
+    ZLOGI("end, device:%{public}.10s, users:%{public}zu", deviceId.c_str(),
+          deviceUserMap_[deviceId].size());
 }
 
 bool UserDelegate::InitLocalUserMeta()
-- 
Gitee