diff --git a/services/ans/src/notification_extension/notification_operation_service.cpp b/services/ans/src/notification_extension/notification_operation_service.cpp index 293fc7bc90a09a9b8f6350d58790efae4cd37480..c94d543b659e3932f28378ab952946583625433a 100644 --- a/services/ans/src/notification_extension/notification_operation_service.cpp +++ b/services/ans/src/notification_extension/notification_operation_service.cpp @@ -96,7 +96,8 @@ void DistributedOperationService::RemoveOperationResponse(const std::string& has if (iterTimer->second == NotificationConstant::INVALID_TIMER_ID) { return; } - ANS_LOGI("Operation timer erase %{public}s %{public}llu", hashCode.c_str(), iterTimer->second); + ANS_LOGI("Operation timer erase %{public}s %{public}s", hashCode.c_str(), + std::to_string(iterTimer->second).c_str()); MiscServices::TimeServiceClient::GetInstance()->StopTimer(iterTimer->second); MiscServices::TimeServiceClient::GetInstance()->DestroyTimer(iterTimer->second); timerMap_.erase(iterTimer); @@ -118,7 +119,8 @@ void DistributedOperationService::ReplyOperationResponse(const std::string& hash if (iterTimer->second == NotificationConstant::INVALID_TIMER_ID) { return; } - ANS_LOGI("Operation timer erase %{public}s %{public}llu", hashCode.c_str(), iterTimer->second); + ANS_LOGI("Operation timer erase %{public}s %{public}s", hashCode.c_str(), + std::to_string(iterTimer->second).c_str()); MiscServices::TimeServiceClient::GetInstance()->StopTimer(iterTimer->second); MiscServices::TimeServiceClient::GetInstance()->DestroyTimer(iterTimer->second); timerMap_.erase(iterTimer); diff --git a/services/distributed/src/helper/ability_manager_helper.cpp b/services/distributed/src/helper/ability_manager_helper.cpp index 6b9279aaf8aadb3744e2d3bd9ad5c2f51cc3e430..aef7414b14f921aa4df65b74e9f51e888248e69c 100644 --- a/services/distributed/src/helper/ability_manager_helper.cpp +++ b/services/distributed/src/helper/ability_manager_helper.cpp @@ -49,7 +49,7 @@ int AbilityManagerHelper::ConnectAbility(const std::string &eventId, const AAFwk if (result == ERR_OK) { operationConnection_[eventId] = connection; } - ANS_LOGI("Ability manager connect call %{public}d %{public}u!", result, operationConnection_.size()); + ANS_LOGI("Ability manager connect call %{public}d %{public}d!", result, (int32_t)(operationConnection_.size())); return result; } @@ -71,7 +71,7 @@ void AbilityManagerHelper::DisconnectServiceAbility(const std::string &eventId, auto ret = AAFwk::AbilityManagerClient::GetInstance()->ReleaseCall(iter->second, element); operationConnection_.erase(eventId); - ANS_LOGI("Ability manager releas call %{public}d %{public}u!", ret, operationConnection_.size()); + ANS_LOGI("Ability manager releas call %{public}d %{public}d!", ret, (int32_t)(operationConnection_.size())); }; operationQueue_->submit(task); } diff --git a/services/distributed/src/helper/distributed_preference.cpp b/services/distributed/src/helper/distributed_preference.cpp index 9c50d58bc83e3a381ad3317b107286f6ea1ccd99..8801eb858c0406225c298ba8dc14ddbcc026faaf 100644 --- a/services/distributed/src/helper/distributed_preference.cpp +++ b/services/distributed/src/helper/distributed_preference.cpp @@ -113,7 +113,7 @@ int32_t DistributedPreferences::GetSavedBundlesIcon(std::vector& bu for (auto item : values) { std::string bundleName = item.first.substr(prefixLength, item.first.size() - prefixLength); bundleNames.push_back(bundleName); - ANS_LOGI("Prefernces saved data %{public}s %{public}u.", bundleName.c_str(), item.second.size()); + ANS_LOGI("Prefernces saved data %{public}s %{public}d.", bundleName.c_str(), (int32_t)(item.second.size())); } return 0; } diff --git a/services/distributed/src/soft_bus/distributed_client.cpp b/services/distributed/src/soft_bus/distributed_client.cpp index 257d8a69ac71d55385762d91df35ffb79c6af2ca..3e611d30cfaffe953b838964a7fd57ba970c7d25 100644 --- a/services/distributed/src/soft_bus/distributed_client.cpp +++ b/services/distributed/src/soft_bus/distributed_client.cpp @@ -32,7 +32,7 @@ DistributedClient& DistributedClient::GetInstance() void DistributedClient::ReleaseClient() { std::lock_guard lock(clientLock_); - ANS_LOGI("Release client socket %{public}u.", socketsId_.size()); + ANS_LOGI("Release client socket %{public}d.", (int32_t)(socketsId_.size())); for (auto& socketItem : socketsId_) { CloseSocket(socketItem.second); } diff --git a/services/distributed/src/soft_bus/distributed_cmd_service.cpp b/services/distributed/src/soft_bus/distributed_cmd_service.cpp index 3b89aa612b1045b31d769049883e56c0eaabe817..f1b1ac1d8df4a7ffef88858c2fd95cf11362c2e3 100644 --- a/services/distributed/src/soft_bus/distributed_cmd_service.cpp +++ b/services/distributed/src/soft_bus/distributed_cmd_service.cpp @@ -76,7 +76,7 @@ void DistributedService::HandleDeviceState(const std::shared_ptr& boxMes uint32_t status = (static_cast(state) << 1); int32_t result = NotificationHelper::SetTargetDeviceStatus(deviceName, status, DEFAULT_LOCK_SCREEN_FLAG, deviceId); - ANS_LOGI("Dans set state %{public}s %{public}u.", deviceName.c_str(), state); + ANS_LOGI("Dans set state %{public}s %{public}d.", deviceName.c_str(), state); } void DistributedService::SyncDeviceState(int32_t state) @@ -98,8 +98,8 @@ void DistributedService::SyncDeviceState(int32_t state) DistributedClient::GetInstance().SendMessage(stateBox.GetByteBuffer(), stateBox.GetByteLength(), TransDataType::DATA_TYPE_MESSAGE, peer.second.deviceId_, peer.second.deviceType_); - ANS_LOGI("Dans SyncDeviceState %{public}d %{public}d %{public}d %{public}u.", - peer.second.deviceType_, localDevice_.deviceType_, state, peerDevice_.size()); + ANS_LOGI("Dans SyncDeviceState %{public}d %{public}d %{public}d %{public}d.", + peer.second.deviceType_, localDevice_.deviceType_, state, (int32_t)(peerDevice_.size())); } }); serviceQueue_->submit(task); @@ -179,7 +179,7 @@ void DistributedService::SyncAllLiveViewNotification(const DistributedDeviceInfo void DistributedService::SyncNotifictionList(const DistributedDeviceInfo& peerDevice, const std::vector& notificationList) { - ANS_LOGI("Dans sync notification %{public}u.", notificationList.size()); + ANS_LOGI("Dans sync notification %{public}d.", (int32_t)(notificationList.size())); NotificationSyncBox notificationSyncBox; notificationSyncBox.SetLocalDeviceId(peerDevice.deviceId_); notificationSyncBox.SetNotificationEmpty(notificationList.empty()); @@ -353,8 +353,8 @@ void DistributedService::GenerateBundleIconSync(const DistributedDeviceInfo& dev cachedIcons.insert(item.GetBundleName()); } bundleIconCache_.insert(std::make_pair(device.deviceId_, cachedIcons)); - ANS_LOGI("Dans Generate bundleIconSync bundle %{public}u %{public}u %{public}u.", - bundleOption.size(), enableBundleOption.size(), unCachedBundleList.size()); + ANS_LOGI("Dans Generate bundle %{public}d %{public}d %{public}d.", (int32_t)(bundleOption.size()), + (int32_t)(enableBundleOption.size()), (int32_t)(unCachedBundleList.size())); std::unordered_map icons; for (auto bundle : unCachedBundleList) { std::string icon; diff --git a/services/distributed/src/soft_bus/distributed_manager.cpp b/services/distributed/src/soft_bus/distributed_manager.cpp index 47d18aa7591d8ee3cb715f06b8e1ce48b5da678c..aac4475f120a721dcd88ac6d4703e3bdefb8d8cd 100644 --- a/services/distributed/src/soft_bus/distributed_manager.cpp +++ b/services/distributed/src/soft_bus/distributed_manager.cpp @@ -45,7 +45,7 @@ void DistributedManager::ReleaseLocalDevice() int32_t DistributedManager::InitLocalDevice(const std::string &deviceId, uint16_t deviceType, const DistributedDeviceConfig config) { - ANS_LOGI("InitLocalDevice %{public}s %{public}u.", StringAnonymous(deviceId).c_str(), deviceType); + ANS_LOGI("InitLocalDevice %{public}s %{public}d.", StringAnonymous(deviceId).c_str(), (int32_t)(deviceType)); DISTRIBUTED_LIVEVIEW_ALL_SCENARIOS_EXTENTION_WRAPPER->InitExtentionWrapper(); DistributedLocalConfig::GetInstance().SetLocalDevice(config); return DistributedService::GetInstance().InitService(deviceId, deviceType); @@ -54,8 +54,8 @@ int32_t DistributedManager::InitLocalDevice(const std::string &deviceId, uint16_ void DistributedManager::AddDevice(const std::string &deviceId, uint16_t deviceType, const std::string &networkId) { - ANS_LOGI("InitLocalDevice %{public}s %{public}u %{public}s.", StringAnonymous(deviceId).c_str(), deviceType, - StringAnonymous(networkId).c_str()); + ANS_LOGI("InitLocalDevice %{public}s %{public}d %{public}s.", StringAnonymous(deviceId).c_str(), + (int32_t)(deviceType), StringAnonymous(networkId).c_str()); DistributedDeviceInfo peerDevice = DistributedDeviceInfo(deviceType, deviceId, networkId); DistributedClient::GetInstance().AddDevice(peerDevice); DistributedService::GetInstance().AddDevice(peerDevice); @@ -63,7 +63,7 @@ void DistributedManager::AddDevice(const std::string &deviceId, uint16_t deviceT void DistributedManager::ReleaseDevice(const std::string &deviceId, uint16_t deviceType) { - ANS_LOGI("ReleaseDevice %{public}s %{public}u.", StringAnonymous(deviceId).c_str(), deviceType); + ANS_LOGI("ReleaseDevice %{public}s %{public}d.", StringAnonymous(deviceId).c_str(), (int32_t)(deviceType)); DISTRIBUTED_LIVEVIEW_ALL_SCENARIOS_EXTENTION_WRAPPER->CloseExtentionWrapper(); DistributedClient::GetInstance().ReleaseDevice(deviceId, deviceType); DistributedService::GetInstance().UnSubscribeNotifictaion(deviceId, deviceType); @@ -72,8 +72,8 @@ void DistributedManager::ReleaseDevice(const std::string &deviceId, uint16_t dev void DistributedManager::RefreshDevice(const std::string &deviceId, uint16_t deviceType, const std::string &networkId) { - ANS_LOGI("RefreshDevice %{public}s %{public}u %{public}s.", StringAnonymous(deviceId).c_str(), - deviceType, StringAnonymous(networkId).c_str()); + ANS_LOGI("RefreshDevice %{public}s %{public}d %{public}s.", StringAnonymous(deviceId).c_str(), + (int32_t)(deviceType), StringAnonymous(networkId).c_str()); DistributedClient::GetInstance().RefreshDevice(deviceId, deviceType, networkId); } diff --git a/services/distributed/src/soft_bus/distributed_publish_service.cpp b/services/distributed/src/soft_bus/distributed_publish_service.cpp index 474c99e092510c5e71d4ab157a7782041fec1a0d..a4179e04a8a77ed3d10c6eb298c22d0e3150685d 100644 --- a/services/distributed/src/soft_bus/distributed_publish_service.cpp +++ b/services/distributed/src/soft_bus/distributed_publish_service.cpp @@ -372,8 +372,8 @@ void DistributedService::HandleNotificationSync(const std::shared_ptr& b return; } - ANS_LOGI("Dans handle sync notification %{public}u %{public}u.", notificationList.size(), - notifications.size()); + ANS_LOGI("Dans handle sync notification %{public}d %{public}d.", (int32_t)(notificationList.size()), + (int32_t)(notifications.size())); for (auto item : notificationList) { ANS_LOGI("Dans sync %{public}s.", item.c_str()); } diff --git a/services/distributed/src/soft_bus/distributed_server.cpp b/services/distributed/src/soft_bus/distributed_server.cpp index 923b228e90c381b4d68dc838a6f056eb862a0903..01fd0c645fe183e22e3adc04631808a103eab76a 100644 --- a/services/distributed/src/soft_bus/distributed_server.cpp +++ b/services/distributed/src/soft_bus/distributed_server.cpp @@ -34,7 +34,7 @@ DistributedServer& DistributedServer::GetInstance() void DistributedServer::ReleaseServer() { - ANS_LOGI("Release server socket %{public}u.", serverSocket_.size()); + ANS_LOGI("Release server socket %{public}d.", (int32_t)(serverSocket_.size())); for (auto& item : serverSocket_) { CloseSocket(item.second); } @@ -55,7 +55,7 @@ void DistributedServer::CheckServer() int32_t DistributedServer::InitServer(const std::string &deviceId, uint16_t deviceType) { if (init.load()) { - ANS_LOGI("Server has inited %{public}u.", serverSocket_.size()); + ANS_LOGI("Server has inited %{public}d.", (int32_t)(serverSocket_.size())); return 0; } int32_t socketId = 0; @@ -112,13 +112,13 @@ void DistributedServer::OnShutdown(int32_t socket, ShutdownReason reason) void DistributedServer::OnBytes(int32_t socket, const void *data, uint32_t dataLen) { DistributedService::GetInstance().OnReceiveMsg(data, dataLen); - ANS_LOGI("Distributed server On bytes %{public}u %{public}d", dataLen, socket); + ANS_LOGI("Distributed server On bytes %{public}d %{public}d", (int32_t)(dataLen), socket); } void DistributedServer::OnMessage(int32_t socket, const void *data, uint32_t dataLen) { DistributedService::GetInstance().OnReceiveMsg(data, dataLen); - ANS_LOGI("Distributed server On message %{public}u %{public}d", dataLen, socket); + ANS_LOGI("Distributed server On message %{public}d %{public}d", (int32_t)(dataLen), socket); } } } diff --git a/services/distributed/src/soft_bus/distributed_service_uitls.cpp b/services/distributed/src/soft_bus/distributed_service_uitls.cpp index 06a0ea6e08fd0d4970f93ad2e0f709f967346a76..3c0e406a9ceaf3a2b30eb4ca525f9863d341b1c4 100644 --- a/services/distributed/src/soft_bus/distributed_service_uitls.cpp +++ b/services/distributed/src/soft_bus/distributed_service_uitls.cpp @@ -54,7 +54,8 @@ bool DistributedService::GetBundleResourceInfo(const std::string bundleName, std return false; } icon = AnsImageUtil::PackImage(iconPixelmap); - ANS_LOGI("Dans get bundle icon bundle %{public}s %{public}u.", bundleName.c_str(), resourceInfo.icon.size()); + ANS_LOGI("Dans get bundle icon bundle %{public}s %{public}d.", bundleName.c_str(), + (int32_t)(resourceInfo.icon.size())); return true; } diff --git a/services/distributed/src/soft_bus/distributed_socket.cpp b/services/distributed/src/soft_bus/distributed_socket.cpp index 7d53b438403e5a055964b5f27a4c6ef9652120f7..d2e7b7f5dbe920660b97f582485bd4f1bfe70565 100644 --- a/services/distributed/src/soft_bus/distributed_socket.cpp +++ b/services/distributed/src/soft_bus/distributed_socket.cpp @@ -41,7 +41,7 @@ static void OnServerBind(int32_t socket, PeerSocketInfo info) static void OnServerShutdown(int32_t socket, ShutdownReason reason) { - ANS_LOGI("Socket fd %{public}d shutdown because %{public}u.", socket, reason); + ANS_LOGI("Socket fd %{public}d shutdown because %{public}d.", socket, (int32_t)(reason)); if (socket <= 0) { ANS_LOGE("Socket fd invalid."); return; @@ -80,7 +80,7 @@ static void OnClientBytes(int32_t socket, const void *data, uint32_t dataLen) static void OnClientShutdown(int32_t socket, ShutdownReason reason) { - ANS_LOGI("Socket fd %{public}d shutdown because %{public}u.", socket, reason); + ANS_LOGI("Socket fd %{public}d shutdown because %{public}d.", socket, (int32_t)(reason)); if (socket <= 0) { ANS_LOGE("Socket fd invalid."); return; @@ -90,7 +90,7 @@ static void OnClientShutdown(int32_t socket, ShutdownReason reason) static void OnQos(int32_t socket, QoSEvent eventId, const QosTV *qos, uint32_t qosCount) { - ANS_LOGI("OnQos %{public}d %{public}d %{public}u", socket, (int32_t)eventId, qosCount); + ANS_LOGI("OnQos %{public}d %{public}d %{public}d", socket, (int32_t)eventId, (int32_t)(qosCount)); for (uint32_t idx = 0; idx < qosCount; idx++) { ANS_LOGI("QosTV: type: %{public}d, value: %{public}d", (int32_t)qos[idx].qos, qos[idx].value); } diff --git a/services/distributed/src/soft_bus/distributed_subscriber.cpp b/services/distributed/src/soft_bus/distributed_subscriber.cpp index 2026ad929186653682f30e8c77f42296d9bde750..251533fcaebaf87cc634e901ff3515a873541952 100644 --- a/services/distributed/src/soft_bus/distributed_subscriber.cpp +++ b/services/distributed/src/soft_bus/distributed_subscriber.cpp @@ -132,7 +132,7 @@ ErrCode DistribuedSubscriber::OnOperationResponse(const std::shared_ptr(BUNDLE_NAME_TYPE, bundle.first)); box.PutValue(std::make_shared(ICON_TYPE, bundle.second)); - ANS_LOGW("SetBundlesIcon %{public}s %{public}u.", bundle.first.c_str(), bundle.second.size()); + ANS_LOGW("SetBundlesIcon %{public}s %{public}d.", bundle.first.c_str(), (int32_t)(bundle.second.size())); if (!box.Serialize(false)) { ANS_LOGW("Set bundles icon failed %{public}s.", bundle.first.c_str()); continue; @@ -145,7 +145,7 @@ bool BundleIconBox::GetBundlesIcon(std::unordered_map& } if (box.GetStringValue(ICON_TYPE, icon) && box.GetStringValue(BUNDLE_NAME_TYPE, bundleName)) { - ANS_LOGI("GetBundlesIcon %{public}s %{public}u.", bundleName.c_str(), icon.size()); + ANS_LOGI("GetBundlesIcon %{public}s %{public}d.", bundleName.c_str(), (int32_t)(icon.size())); bundles.insert(std::make_pair(bundleName, icon)); } } diff --git a/services/distributed/src/tlv_box/request_box.cpp b/services/distributed/src/tlv_box/request_box.cpp index 147edf4f5e6829ff3cd3874849f6053fe94b8b38..475200c6cb0e9cc0cc66893346b66e81c5caee6a 100644 --- a/services/distributed/src/tlv_box/request_box.cpp +++ b/services/distributed/src/tlv_box/request_box.cpp @@ -81,7 +81,7 @@ bool NotifticationRequestBox::SetNotificationTitle(const std::string& title) } uint32_t maxLength = static_cast(DistributedLocalConfig::GetInstance().GetTitleLength()); if (title.size() > maxLength) { - ANS_LOGI("SetNotificationTitle truncate %{public}u %{public}u", title.size(), maxLength); + ANS_LOGI("SetNotificationTitle truncate %{public}d %{public}d", (int32_t)(title.size()), (int32_t)(maxLength)); std::string subTitle = title.substr(0, maxLength); ANS_LOGI("SetNotificationTitle truncate %{public}s %{public}s", subTitle.c_str(), title.c_str()); return box_->PutValue(std::make_shared(NOTIFICATION_TITLE, subTitle)); @@ -96,7 +96,7 @@ bool NotifticationRequestBox::SetNotificationText(const std::string& text) } uint32_t maxLength = static_cast(DistributedLocalConfig::GetInstance().GetContentLength()); if (text.size() > maxLength) { - ANS_LOGI("SetNotificationText truncate %{public}u %{public}u", text.size(), maxLength); + ANS_LOGI("SetNotificationText truncate %{public}d %{public}d", (int32_t)(text.size()), (int32_t)(maxLength)); std::string subText = text.substr(0, maxLength); ANS_LOGI("SetNotificationTitle truncate %{public}s %{public}s", subText.c_str(), text.c_str()); return box_->PutValue(std::make_shared(NOTIFICATION_CONTENT, subText)); @@ -174,7 +174,7 @@ bool NotifticationRequestBox::SetBigIcon(const std::shared_ptr& return false; } std::string icon = AnsImageUtil::PackImage(copyPixelMap); - ANS_LOGI("SetBigIcon %{public}u, %{public}u", copyIcon.size(), icon.size()); + ANS_LOGI("SetBigIcon %{public}d, %{public}d", (int32_t)(copyIcon.size()), (int32_t)(icon.size())); return box_->PutValue(std::make_shared(NOTIFICATION_BIG_ICON, icon)); } @@ -189,7 +189,7 @@ bool NotifticationRequestBox::SetOverlayIcon(const std::shared_ptrPutValue(std::make_shared(NOTIFICATION_OVERLAY_ICON, icon)); } @@ -342,7 +342,7 @@ bool NotifticationRequestBox::GetBigIcon(std::shared_ptr& bigIc if (!box_->GetStringValue(NOTIFICATION_BIG_ICON, bigIconContent)) { return false; } - ANS_LOGI("GetBigIcon %{public}u", bigIconContent.size()); + ANS_LOGI("GetBigIcon %{public}d", (int32_t)(bigIconContent.size())); bigIcon = AnsImageUtil::UnPackImage(bigIconContent); return true; } @@ -356,7 +356,7 @@ bool NotifticationRequestBox::GetOverlayIcon(std::shared_ptr& o if (!box_->GetStringValue(NOTIFICATION_OVERLAY_ICON, overlayContent)) { return false; } - ANS_LOGI("GetOverlayIcon %{public}u", overlayContent.size()); + ANS_LOGI("GetOverlayIcon %{public}d", (int32_t)(overlayContent.size())); overlayIcon = AnsImageUtil::UnPackImage(overlayContent); return true; } diff --git a/services/distributed/src/tlv_box/tlv_box.cpp b/services/distributed/src/tlv_box/tlv_box.cpp index ce0516933b609912c94be73176a569d5eb5f3e18..6e1faba3d163f8ea7ad29a44d9a1effa8c7e079d 100644 --- a/services/distributed/src/tlv_box/tlv_box.cpp +++ b/services/distributed/src/tlv_box/tlv_box.cpp @@ -272,7 +272,7 @@ bool TlvBox::Serialize(bool addCheck) uint32_t calCrc = crc32(crc32(0L, Z_NULL, 0), (const Bytef*)byteBuffer_, offset); uint32_t calValue = htonl(calCrc); (void)memcpy_s(byteBuffer_ + offset, sizeof(uint32_t), &calValue, sizeof(uint32_t)); - ANS_LOGI("Box Serialize crc32 %{public}u %{public}u.", offset + sizeof(uint32_t), calCrc); + ANS_LOGI("Box Serialize crc32 %{public}d %{public}d.", (int32_t)(offset + sizeof(uint32_t)), (int32_t)(calCrc)); } else { ANS_LOGI("Box Serialize crc32 %{public}d.", offset); } @@ -288,13 +288,13 @@ bool TlvBox::CheckMessageCRC(const unsigned char*data, uint32_t dataLen) { uint32_t calcSize = sizeof(uint32_t); if (dataLen <= calcSize || dataLen > MAX_BUFFER_LENGTH) { - ANS_LOGW("Box check length failed %{public}u.", dataLen); + ANS_LOGW("Box check length failed %{public}d.", (int32_t)(dataLen)); return false; } uint32_t recv = ntohl((*(uint32_t*)(data + dataLen - calcSize))); uint32_t calc = crc32(crc32(0L, Z_NULL, 0), (const Bytef*)data, dataLen - calcSize); if (calc != recv) { - ANS_LOGW("Box check crc32 failed %{public}u %{public}u.", recv, calc); + ANS_LOGW("Box check crc32 failed %{public}d %{public}d.", (int32_t)(recv), (int32_t)(calc)); return false; } return true;