From 2d42d48061031662f696c6d7453c459026b8d4be Mon Sep 17 00:00:00 2001 From: zhangzezhong Date: Thu, 10 Jul 2025 15:28:57 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhangzezhong --- .../src/uri_permission_manager_client.cpp | 14 +++++--------- .../src/uri_permission_manager_stub_impl.cpp | 2 +- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/interfaces/inner_api/uri_permission/src/uri_permission_manager_client.cpp b/interfaces/inner_api/uri_permission/src/uri_permission_manager_client.cpp index 3c770693e0..6327f3544e 100644 --- a/interfaces/inner_api/uri_permission/src/uri_permission_manager_client.cpp +++ b/interfaces/inner_api/uri_permission/src/uri_permission_manager_client.cpp @@ -67,7 +67,7 @@ int UriPermissionManagerClient::GrantUriPermission(const std::vector &uriVe TAG_LOGI(AAFwkTag::URIPERMMGR, "targetBundleName:%{public}s, uriVecSize:%{public}zu", targetBundleName.c_str(), uriVec.size()); if (uriVec.empty() || uriVec.size() > MAX_URI_COUNT) { - TAG_LOGE(AAFwkTag::URIPERMMGR, "uriVec empty or exceed maxSize %{public}d, uriVec size: %{public}d", + TAG_LOGE(AAFwkTag::URIPERMMGR, "uriVec empty or exceed maxSize %{public}d, uriVec size: %{public}zu", MAX_URI_COUNT, uriVec.size()); return ERR_URI_LIST_OUT_OF_RANGE; } @@ -111,7 +111,7 @@ int32_t UriPermissionManagerClient::GrantUriPermissionPrivileged(const std::vect TAG_LOGI(AAFwkTag::URIPERMMGR, "targetBundleName:%{public}s, uriVecSize:%{public}zu", targetBundleName.c_str(), uriVec.size()); if (uriVec.empty() || uriVec.size() > MAX_URI_COUNT) { - TAG_LOGE(AAFwkTag::URIPERMMGR, "uriVec empty or exceed maxSize %{public}d, uriVec size: %{public}d", + TAG_LOGE(AAFwkTag::URIPERMMGR, "uriVec empty or exceed maxSize %{public}d, uriVec size: %{public}zu", MAX_URI_COUNT, uriVec.size()); return ERR_URI_LIST_OUT_OF_RANGE; } @@ -239,7 +239,7 @@ std::vector UriPermissionManagerClient::CheckUriAuthorization(const std::v TAG_LOGI(AAFwkTag::URIPERMMGR, "flag:%{public}u, tokenId:%{public}u", flag, tokenId); std::vector errorRes(size, false); if (uriVec.empty() || uriVec.size() > MAX_URI_COUNT) { - TAG_LOGE(AAFwkTag::URIPERMMGR, "uriVec empty or exceed maxSize %{public}d, uriVec size: %{public}d", + TAG_LOGE(AAFwkTag::URIPERMMGR, "uriVec empty or exceed maxSize %{public}d, uriVec size: %{public}zu", MAX_URI_COUNT, uriVec.size()); return errorRes; } @@ -418,11 +418,7 @@ bool UriPermissionManagerClient::RawDataToBoolVec(const UriPermissionRawData& ra for (uint32_t i = 0; i < boolCount; ++i) { char resChar; ss.read(reinterpret_cast(&resChar), sizeof(resChar)); - if (resChar == 0) { - boolVec.at(i) = false; - } else { - boolVec.at(i) = true; - } + boolVec.at(i) = (resChar != 0); } return true; } @@ -450,7 +446,7 @@ int32_t UriPermissionManagerClient::Active(const std::vector &policy { TAG_LOGD(AAFwkTag::URIPERMMGR, "call"); if (policy.empty() || policy.size() > MAX_URI_COUNT) { - TAG_LOGE(AAFwkTag::URIPERMMGR, "uriVec empty or exceed maxSize %{public}d, policy size: %{public}d", + TAG_LOGE(AAFwkTag::URIPERMMGR, "uriVec empty or exceed maxSize %{public}d, policy size: %{public}zu", MAX_URI_COUNT, policy.size()); return ERR_URI_LIST_OUT_OF_RANGE; } diff --git a/services/uripermmgr/src/uri_permission_manager_stub_impl.cpp b/services/uripermmgr/src/uri_permission_manager_stub_impl.cpp index 2b68034d84..d8321329fe 100644 --- a/services/uripermmgr/src/uri_permission_manager_stub_impl.cpp +++ b/services/uripermmgr/src/uri_permission_manager_stub_impl.cpp @@ -778,7 +778,7 @@ ErrCode UriPermissionManagerStubImpl::CheckUriAuthorization(const std::vector(uriStrVec.size(), false); if (uriStrVec.size() == 0 || uriStrVec.size() > MAX_URI_COUNT) { - TAG_LOGE(AAFwkTag::URIPERMMGR, "uriVec empty or exceed maxSize %{public}d uriStrVec size: %{public}d", + TAG_LOGE(AAFwkTag::URIPERMMGR, "uriVec empty or exceed maxSize %{public}d uriStrVec size: %{public}zu", MAX_URI_COUNT, uriStrVec.size()); return ERR_URI_LIST_OUT_OF_RANGE; }