From fd2544b4b541163cf732b10caff98ff5d586c999 Mon Sep 17 00:00:00 2001 From: chensi10 Date: Thu, 19 Aug 2021 19:31:27 +0800 Subject: [PATCH] modify 64arm build bug Signed-off-by: chensi10 --- .../abilityManager/napi_ability_manager.cpp | 24 +++++++++---------- .../abilitymgr/src/data_ability_manager.cpp | 4 ++-- .../abilitymgr/src/data_ability_record.cpp | 2 +- .../abilitymgr/src/pending_want_manager.cpp | 2 +- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/interfaces/kits/napi/aafwk/abilityManager/napi_ability_manager.cpp b/interfaces/kits/napi/aafwk/abilityManager/napi_ability_manager.cpp index 42dc6d0b601..c0fe1f2636a 100644 --- a/interfaces/kits/napi/aafwk/abilityManager/napi_ability_manager.cpp +++ b/interfaces/kits/napi/aafwk/abilityManager/napi_ability_manager.cpp @@ -272,7 +272,7 @@ napi_value NAPI_QueryRecentAbilityMissionInfosWrap( GetAbilityManagerInstance()->GetRecentMissions(async_callback_info->maxMissionNum, async_callback_info->queryType, async_callback_info->recentMissionInfo); - HILOG_INFO("size = [%{public}d]", async_callback_info->recentMissionInfo.size()); + HILOG_INFO("size = [%{public}zu]", async_callback_info->recentMissionInfo.size()); }, [](napi_env env, napi_status status, void *data) { HILOG_INFO("queryRecentAbilityMissionInfos compeleted(Promise Mode)..."); @@ -296,7 +296,7 @@ napi_value NAPI_QueryRecentAbilityMissionInfos(napi_env env, napi_callback_info size_t argc = 3; napi_value argv[argc]; NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, NULL, NULL)); - HILOG_INFO("argc = [%{public}d]", argc); + HILOG_INFO("argc = [%{public}zu]", argc); napi_valuetype valuetype0; NAPI_CALL(env, napi_typeof(env, argv[0], &valuetype0)); @@ -360,7 +360,7 @@ napi_value NAPI_QueryRunningAbilityMissionInfosWrap( GetAbilityManagerInstance()->GetRecentMissions(async_callback_info->maxMissionNum, async_callback_info->queryType, async_callback_info->recentMissionInfo); - HILOG_INFO("size = [%{public}d]", async_callback_info->recentMissionInfo.size()); + HILOG_INFO("size = [%{public}zu]", async_callback_info->recentMissionInfo.size()); }, [](napi_env env, napi_status status, void *data) { HILOG_INFO("NAPI_QueryRunningAbilityMissionInfosWrap compeleted(CallBack Mode)..."); @@ -412,7 +412,7 @@ napi_value NAPI_QueryRunningAbilityMissionInfosWrap( GetAbilityManagerInstance()->GetRecentMissions(async_callback_info->maxMissionNum, async_callback_info->queryType, async_callback_info->recentMissionInfo); - HILOG_INFO("size = [%{public}d]", async_callback_info->recentMissionInfo.size()); + HILOG_INFO("size = [%{public}zu]", async_callback_info->recentMissionInfo.size()); }, [](napi_env env, napi_status status, void *data) { HILOG_INFO("queryRunningAbilityMissionInfos compeleted(Promise Mode)..."); @@ -436,7 +436,7 @@ napi_value NAPI_QueryRunningAbilityMissionInfos(napi_env env, napi_callback_info size_t argc = 2; napi_value argv[argc]; NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, NULL, NULL)); - HILOG_INFO("argc = [%{public}d]", argc); + HILOG_INFO("argc = [%{public}zu]", argc); napi_valuetype valuetype0; NAPI_CALL(env, napi_typeof(env, argv[0], &valuetype0)); @@ -559,7 +559,7 @@ napi_value NAPI_GetAllRunningProcesses(napi_env env, napi_callback_info info) size_t argc = 1; napi_value argv[argc]; NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, NULL, NULL)); - HILOG_INFO("argc = [%{public}d]", argc); + HILOG_INFO("argc = [%{public}zu]", argc); bool callBackMode = false; if (argc >= 1) { @@ -672,7 +672,7 @@ napi_value NAPI_RemoveMission(napi_env env, napi_callback_info info) size_t argc = 2; napi_value argv[argc]; NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, NULL, NULL)); - HILOG_INFO("argc = [%{public}d]", argc); + HILOG_INFO("argc = [%{public}zu]", argc); napi_valuetype valuetype0; NAPI_CALL(env, napi_typeof(env, argv[0], &valuetype0)); @@ -793,7 +793,7 @@ napi_value NAPI_RemoveMissions(napi_env env, napi_callback_info info) size_t argc = 2; napi_value argv[argc]; NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, NULL, NULL)); - HILOG_INFO("argc = [%{public}d]", argc); + HILOG_INFO("argc = [%{public}zu]", argc); uint32_t arrayLength = 0; NAPI_CALL(env, napi_get_array_length(env, argv[0], &arrayLength)); @@ -925,7 +925,7 @@ napi_value NAPI_ClearMissions(napi_env env, napi_callback_info info) size_t argc = 1; napi_value argv[argc]; NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, NULL, NULL)); - HILOG_INFO("argc = [%{public}d]", argc); + HILOG_INFO("argc = [%{public}zu]", argc); bool callBackMode = false; if (argc >= 1) { @@ -1038,7 +1038,7 @@ napi_value NAPI_MoveMissionToTop(napi_env env, napi_callback_info info) size_t argc = 2; napi_value argv[argc]; NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, NULL, NULL)); - HILOG_INFO("argc = [%{public}d]", argc); + HILOG_INFO("argc = [%{public}zu]", argc); napi_valuetype valuetype0; NAPI_CALL(env, napi_typeof(env, argv[0], &valuetype0)); @@ -1158,7 +1158,7 @@ napi_value NAPI_KillProcessesByBundleName(napi_env env, napi_callback_info info) size_t argc = 2; napi_value argv[argc]; NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, NULL, NULL)); - HILOG_INFO("argc = [%{public}d]", argc); + HILOG_INFO("argc = [%{public}zu]", argc); std::string bundleName; ParseBundleName(env, bundleName, argv[0]); @@ -1279,7 +1279,7 @@ napi_value NAPI_ClearUpApplicationData(napi_env env, napi_callback_info info) size_t argc = 2; napi_value argv[argc]; NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, NULL, NULL)); - HILOG_INFO("argc = [%{public}d]", argc); + HILOG_INFO("argc = [%{public}zu]", argc); std::string bundleName; ParseBundleName(env, bundleName, argv[0]); diff --git a/services/abilitymgr/src/data_ability_manager.cpp b/services/abilitymgr/src/data_ability_manager.cpp index 6d9eb6d3306..4ec44c6fccc 100644 --- a/services/abilitymgr/src/data_ability_manager.cpp +++ b/services/abilitymgr/src/data_ability_manager.cpp @@ -422,14 +422,14 @@ void DataAbilityManager::DumpLocked(const char *func, int line) HILOG_INFO("Data ability manager dump"); } - HILOG_INFO("Available data ability count: %{public}u", dataAbilityRecordsLoaded_.size()); + HILOG_INFO("Available data ability count: %{public}zu", dataAbilityRecordsLoaded_.size()); for (auto it = dataAbilityRecordsLoaded_.begin(); it != dataAbilityRecordsLoaded_.end(); ++it) { HILOG_INFO("'%{public}s':", it->first.c_str()); it->second->Dump(); } - HILOG_INFO("Loading data ability count: %{public}u", dataAbilityRecordsLoading_.size()); + HILOG_INFO("Loading data ability count: %{public}zu", dataAbilityRecordsLoading_.size()); for (auto it = dataAbilityRecordsLoading_.begin(); it != dataAbilityRecordsLoading_.end(); ++it) { HILOG_INFO("'%{public}s':", it->first.c_str()); diff --git a/services/abilitymgr/src/data_ability_record.cpp b/services/abilitymgr/src/data_ability_record.cpp index 59690d38210..cbfe4fe813d 100644 --- a/services/abilitymgr/src/data_ability_record.cpp +++ b/services/abilitymgr/src/data_ability_record.cpp @@ -410,7 +410,7 @@ void DataAbilityRecord::Dump() const { CHECK_POINTER(ability_); - HILOG_INFO("attached: %{public}s, clients: %{public}u, refcnt: %{public}d, state: %{public}s", + HILOG_INFO("attached: %{public}s, clients: %{public}zu, refcnt: %{public}d, state: %{public}s", scheduler_ ? "true" : "false", clients_.size(), scheduler_ ? scheduler_->GetSptrRefCount() : 0, diff --git a/services/abilitymgr/src/pending_want_manager.cpp b/services/abilitymgr/src/pending_want_manager.cpp index 8923936c4a1..abce811e732 100644 --- a/services/abilitymgr/src/pending_want_manager.cpp +++ b/services/abilitymgr/src/pending_want_manager.cpp @@ -271,7 +271,7 @@ int32_t PendingWantManager::PendingRecordIdCreate() sptr PendingWantManager::GetPendingWantRecordByCode(int32_t code) { - HILOG_INFO("%{public}s:begin. wantRecords_ size = %{public}d", __func__, wantRecords_.size()); + HILOG_INFO("%{public}s:begin. wantRecords_ size = %{public}zu", __func__, wantRecords_.size()); std::lock_guard locker(mutex_); auto iter = std::find_if(wantRecords_.begin(), wantRecords_.end(), [&code](const auto &pair) { -- Gitee