From b30d68a0653c57e8ecee4f44540fd839edf655c1 Mon Sep 17 00:00:00 2001 From: shihaojie6128 Date: Wed, 13 Mar 2024 15:08:41 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: shihaojie6128 --- .../dtbschedmgr/src/distributed_sched_stub.cpp | 4 ++-- .../distributed_mission_broadcast_listener.cpp | 4 ++-- .../distributed_sched_continue_manager.cpp | 18 +++++++++--------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/services/dtbschedmgr/src/distributed_sched_stub.cpp b/services/dtbschedmgr/src/distributed_sched_stub.cpp index 4e997be4..871f06da 100644 --- a/services/dtbschedmgr/src/distributed_sched_stub.cpp +++ b/services/dtbschedmgr/src/distributed_sched_stub.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023 Huawei Device Co., Ltd. + * Copyright (c) 2021-2024 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -171,7 +171,7 @@ int32_t DistributedSchedStub::OnRemoteRequest(uint32_t code, MessageParcel& data, MessageParcel& reply, MessageOption& option) { bool IsLocalCalling = IPCSkeleton::IsLocalCalling(); - HILOGI("OnRemoteRequest, code = %{public}d, flags = %{public}d, IsLocalCalling = %{public}d.", + HILOGI("OnRemoteRequest, code = %{public}u, flags = %{public}d, IsLocalCalling = %{public}d.", code, option.GetFlags(), IsLocalCalling); const auto& funcsMap = IsLocalCalling ? localFuncsMap_ : remoteFuncsMap_; diff --git a/services/dtbschedmgr/src/mission/distributed_mission_broadcast_listener.cpp b/services/dtbschedmgr/src/mission/distributed_mission_broadcast_listener.cpp index 1a9e49df..7ce24258 100644 --- a/services/dtbschedmgr/src/mission/distributed_mission_broadcast_listener.cpp +++ b/services/dtbschedmgr/src/mission/distributed_mission_broadcast_listener.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 Huawei Device Co., Ltd. + * Copyright (c) 2024 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -26,7 +26,7 @@ const std::string TAG = "DistributedMissionBroadcastListener"; } void DistributedMissionBroadcastListener::OnDataRecv(std::string& senderNetworkId, uint8_t* payload, uint32_t dataLen) { - HILOGI("OnDataRecv, dataLen = %{public}d", dataLen); + HILOGI("OnDataRecv, dataLen = %{public}u", dataLen); DistributedSchedContinueManager::GetInstance().NotifyDataRecv(senderNetworkId, payload, dataLen); } } // namespace DistributedSchedule diff --git a/services/dtbschedmgr/src/mission/distributed_sched_continue_manager.cpp b/services/dtbschedmgr/src/mission/distributed_sched_continue_manager.cpp index 9727c954..b006f5ee 100644 --- a/services/dtbschedmgr/src/mission/distributed_sched_continue_manager.cpp +++ b/services/dtbschedmgr/src/mission/distributed_sched_continue_manager.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 Huawei Device Co., Ltd. + * Copyright (c) 2024 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -106,16 +106,16 @@ void DistributedSchedContinueManager::NotifyMissionUnfocused(const int32_t missi void DistributedSchedContinueManager::NotifyDataRecv(std::string& senderNetworkId, uint8_t* payload, uint32_t dataLen) { - HILOGI("NotifyDataRecv start, senderNetworkId: %{public}s, dataLen: %{public}d", + HILOGI("NotifyDataRecv start, senderNetworkId: %{public}s, dataLen: %{public}u", DnetworkAdapter::AnonymizeNetworkId(senderNetworkId).c_str(), dataLen); if (dataLen != DMS_SEND_LEN) { - HILOGE("dataLen error, dataLen: %{public}d", dataLen); + HILOGE("dataLen error, dataLen: %{public}u", dataLen); return; } uint8_t type = (payload[0] & DMS_0XF0) >> CONTINUE_SHIFT_04; uint8_t len = payload[0] & DMS_0X0F; if (len != sizeof(uint32_t) || (type != DMS_UNFOCUSED_TYPE && type != DMS_FOCUSED_TYPE)) { - HILOGE("len or type error, len: %{public}d, type: %{public}d", len, type); + HILOGE("len or type error, len: %{public}u, type: %{public}u", len, type); return; } uint32_t accessTokenId = payload[1] << CONTINUE_SHIFT_24 | payload[INDEX_2] << CONTINUE_SHIFT_16 | @@ -249,10 +249,10 @@ int32_t DistributedSchedContinueManager::DealFocusedBusiness(const int32_t missi uint32_t accessTokenId; ret = BundleManagerInternal::GetBundleIdFromBms(bundleName, accessTokenId); if (ret != ERR_OK) { - HILOGE("get focused accessTokenId failed, accessTokenId: %{public}d, ret: %{public}d", accessTokenId, ret); + HILOGE("get focused accessTokenId failed, accessTokenId: %{public}u, ret: %{public}d", accessTokenId, ret); return ret; } - HILOGE("get focused accessTokenId success, accessTokenId: %{public}d", accessTokenId); + HILOGE("get focused accessTokenId success, accessTokenId: %{public}u", accessTokenId); uint32_t sendDataLen = DMS_SEND_LEN; uint8_t data[DMS_SEND_LEN]; uint8_t type = DMS_FOCUSED_TYPE; @@ -313,7 +313,7 @@ int32_t DistributedSchedContinueManager::DealUnfocusedBusiness(const int32_t mis uint32_t accessTokenId; ret = BundleManagerInternal::GetBundleIdFromBms(bundleName, accessTokenId); if (ret != ERR_OK) { - HILOGE("get unfocused accessTokenId failed, accessTokenId: %{public}d, ret: %{public}d", accessTokenId, ret); + HILOGE("get unfocused accessTokenId failed, accessTokenId: %{public}u, ret: %{public}d", accessTokenId, ret); return ret; } uint32_t sendDataLen = DMS_SEND_LEN; @@ -475,7 +475,7 @@ int32_t DistributedSchedContinueManager::DealSetMissionContinueStateBusiness(con uint32_t accessTokenId; ret = BundleManagerInternal::GetBundleIdFromBms(bundleName, accessTokenId); if (ret != ERR_OK) { - HILOGE("get setContinueState accessTokenId failed, accessTokenId: %{public}d, ret: %{public}d", + HILOGE("get setContinueState accessTokenId failed, accessTokenId: %{public}u, ret: %{public}d", accessTokenId, ret); return ret; } @@ -494,7 +494,7 @@ int32_t DistributedSchedContinueManager::DealSetMissionContinueStateBusiness(con data[INDEX_4] = accessTokenId & DMS_0XFF; ret = SoftbusAdapter::GetInstance().SendSoftbusEvent(data, sendDataLen); if (ret != ERR_OK) { - HILOGE("SendSoftbusEvent setContinueState failed, sendDataLen: %{public}d, ret: %{public}d", sendDataLen, ret); + HILOGE("SendSoftbusEvent setContinueState failed, sendDataLen: %{public}u, ret: %{public}d", sendDataLen, ret); return ret; }