From cae0ab976f57d8c2f5ed9048a7c7afb735746c0e Mon Sep 17 00:00:00 2001 From: sam_wusb Date: Tue, 19 Nov 2024 02:27:47 +0000 Subject: [PATCH 1/3] update device_info/device_info_load.cpp. Signed-off-by: sam_wusb --- device_info/device_info_load.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device_info/device_info_load.cpp b/device_info/device_info_load.cpp index e392ebe85..462b9e8d9 100644 --- a/device_info/device_info_load.cpp +++ b/device_info/device_info_load.cpp @@ -29,7 +29,7 @@ void DeviceInfoLoad::OnLoadSystemAbilitySuccess(int32_t systemAbilityId, { DINFO_CHECK(systemAbilityId == SYSPARAM_DEVICE_SERVICE_ID, return, "start systemabilityId is not deviceinfo! %d", systemAbilityId); - if (remoteObject == nullptr) { + if (remoteObject == nullptr) { DINFO_LOGI("OnLoadSystemAbilitySuccess but remote is null %d", systemAbilityId); DeviceInfoKits::GetInstance().FinishStartSAFailed(); return; -- Gitee From 814822389eab176573706d7a65a1639f84789b3a Mon Sep 17 00:00:00 2001 From: sam_wusb Date: Sat, 28 Dec 2024 07:07:32 +0000 Subject: [PATCH 2/3] update services/init/init_capability.c. Signed-off-by: sam_wusb --- services/init/init_capability.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/services/init/init_capability.c b/services/init/init_capability.c index 17e002425..5d400a300 100644 --- a/services/init/init_capability.c +++ b/services/init/init_capability.c @@ -75,9 +75,9 @@ static unsigned int GetCapByString(const char *capStr) { "PERFMON", CAP_PERFMON }, #endif }; - int mapSize = (int)ARRAY_LENGTH(capStrCapNum); - int capLen = strlen("CAP_"); - for (int j = 0; j < mapSize; j++) { + int mapSize =(int)ARRAY_LENGTH(capStrCapNum); + int capLen=strlen("CAP_"); + for (int j = 0; j < mapSize; j++){ if ((strcmp(capStr, capStrCapNum[j].capStr) == 0) || ((strncmp(capStr, "CAP_", capLen) == 0) && (strcmp(capStr + capLen, capStrCapNum[j].capStr) == 0))) { -- Gitee From b8dd6e364a5036efd14086d322df1fd4b4dced9a Mon Sep 17 00:00:00 2001 From: sam_wusb Date: Sat, 28 Dec 2024 07:17:24 +0000 Subject: [PATCH 3/3] update services/utils/init_utils.c. Signed-off-by: sam_wusb --- services/utils/init_utils.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/services/utils/init_utils.c b/services/utils/init_utils.c index 4023d19c3..cabd7d503 100644 --- a/services/utils/init_utils.c +++ b/services/utils/init_utils.c @@ -51,9 +51,9 @@ float ConvertMicrosecondToSecond(int x) #ifndef __LITEOS_M__ static bool CheckDigit(const char *name) { - size_t nameLen = strlen(name); - for (size_t i = 0; i < nameLen; ++i) { - if (!isdigit(name[i])) { + size_t nameLen=strlen(name); + for (size_t i = 0; i < nameLen; ++i) { + if (!isdigit(name[i])){ return false; } } -- Gitee