From e240481bf1d6835216861207a29f0b4e0f55111f Mon Sep 17 00:00:00 2001 From: wang-kang0512 Date: Fri, 25 Jul 2025 17:09:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81=E5=91=8A?= =?UTF-8?q?=E8=AD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wang-kang0512 --- modules/common/appspawn_encaps.c | 8 ++++---- test/mock/app_spawn_stub.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/common/appspawn_encaps.c b/modules/common/appspawn_encaps.c index 6d492d80..f5c11a25 100644 --- a/modules/common/appspawn_encaps.c +++ b/modules/common/appspawn_encaps.c @@ -140,7 +140,7 @@ APPSPAWN_STATIC int AddPermissionStrToValue(const char *valueStr, UserEncap *enc return 0; } -APPSPAWN_STATIC int AddPermissionIntArrayToValue(cJSON *arrayItem, UserEncap *encap, int arraySize) +APPSPAWN_STATIC int AddPermissionIntArrayToValue(cJSON *arrayItem, UserEncap *encap, uint32_t arraySize) { uint32_t valueLen = sizeof(int) * arraySize; APPSPAWN_CHECK(valueLen <= OH_ENCAPS_VALUE_MAX_LEN, return APPSPAWN_ARG_INVALID, @@ -164,7 +164,7 @@ APPSPAWN_STATIC int AddPermissionIntArrayToValue(cJSON *arrayItem, UserEncap *en return 0; } -APPSPAWN_STATIC int AddPermissionBoolArrayToValue(cJSON *arrayItem, UserEncap *encap, int arraySize) +APPSPAWN_STATIC int AddPermissionBoolArrayToValue(cJSON *arrayItem, UserEncap *encap, uint32_t arraySize) { uint32_t valueLen = sizeof(bool) * arraySize; APPSPAWN_CHECK(valueLen <= OH_ENCAPS_VALUE_MAX_LEN, return APPSPAWN_ARG_INVALID, @@ -222,7 +222,7 @@ APPSPAWN_STATIC int AddPermissionStrArrayToValue(cJSON *arrayItem, UserEncap *en APPSPAWN_STATIC int AddPermissionArrayToValue(cJSON *permissionItemArr, UserEncap *encap) { - int arraySize = cJSON_GetArraySize(permissionItemArr); + uint32_t arraySize = (uint32_t)cJSON_GetArraySize(permissionItemArr); if (arraySize == 0) { return APPSPAWN_ARG_INVALID; } @@ -349,7 +349,7 @@ static int SpawnSetMaxPids(AppSpawningCtx *property, UserEncaps *encapsInfo) APPSPAWN_CHECK(encapsInfo->encapsCount < OH_ENCAPS_MAX_COUNT, return APPSPAWN_ARG_INVALID, "Encaps count is more than 64, cannot set permissions"); - int count = encapsInfo->encapsCount; + uint32_t count = encapsInfo->encapsCount; int ret = strcpy_s(encapsInfo->encap[count].key, OH_ENCAPS_KEY_MAX_LEN, APP_OHOS_ENCAPS_FORK_KEY); APPSPAWN_CHECK_ONLY_EXPER(ret == EOK, return APPSPAWN_SYSTEM_ERROR); diff --git a/test/mock/app_spawn_stub.h b/test/mock/app_spawn_stub.h index d451750e..5abe3276 100644 --- a/test/mock/app_spawn_stub.h +++ b/test/mock/app_spawn_stub.h @@ -142,8 +142,8 @@ int AddPermissionItemToEncapsInfo(UserEncap *encap, cJSON *permissionItem); void FreeEncapsInfo(UserEncaps *encapsInfo); int SpawnSetEncapsPermissions(AppSpawnMgr *content, AppSpawningCtx *property); int WriteEncapsInfo(int fd, AppSpawnEncapsBaseType encapsType, const void *encapsInfo, uint32_t flag); -int AddPermissionIntArrayToValue(cJSON *arrayItem, UserEncap *encap, int arraySize); -int AddPermissionBoolArrayToValue(cJSON *arrayItem, UserEncap *encap, int arraySize); +int AddPermissionIntArrayToValue(cJSON *arrayItem, UserEncap *encap, uint32_t arraySize); +int AddPermissionBoolArrayToValue(cJSON *arrayItem, UserEncap *encap, uint32_t arraySize); int AddPermissionStrArrayToValue(cJSON *arrayItem, UserEncap *encap); int AddPermissionArrayToValue(cJSON *permissionItemArr, UserEncap *encap); -- Gitee