From 9f0640123dea54bc9d2e96f973bef5dfc35d8b1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E7=8F=9E=E9=A3=8E?= Date: Mon, 14 Mar 2022 08:09:20 +0000 Subject: [PATCH] Description:Code quality cleanup. Sig:aafwk Feature or Bugfix:Bugfix Binary Source:No #I4XNQM; Signed-off-by: wuluofeng --- .../entry/src/main/cpp/main_ability_slice.cpp | 7 +++-- .../abilitymgr_lite/src/abilityms_client.cpp | 3 ++- .../src/slite/ability_manager_inner.cpp | 2 +- frameworks/want_lite/src/want.cpp | 8 ++++-- .../kits/ability_lite/ability_manager.h | 2 +- interfaces/kits/js/napi/js_aafwk.cpp | 2 +- .../abilitymgr_lite/include/ability_stack.h | 2 +- .../include/util/abilityms_status.h | 26 +++++++++---------- .../page_ability_test/page_ability_test.cpp | 2 +- .../unittest/utils/ability_test_helper.cpp | 9 +++---- 10 files changed, 35 insertions(+), 28 deletions(-) diff --git a/frameworks/ability_lite/example/entry/src/main/cpp/main_ability_slice.cpp b/frameworks/ability_lite/example/entry/src/main/cpp/main_ability_slice.cpp index 4fd4531..59e9f90 100644 --- a/frameworks/ability_lite/example/entry/src/main/cpp/main_ability_slice.cpp +++ b/frameworks/ability_lite/example/entry/src/main/cpp/main_ability_slice.cpp @@ -48,8 +48,11 @@ int32_t IpcMsgHandler(int funcId, ElementName *elementName, SvcIdentity *service IpcIo request; char data[IPC_IO_DATA_MAX]; IpcIoInit(&request, data, IPC_IO_DATA_MAX, 0); - IpcIoPushInt32(&request, 10); - IpcIoPushInt32(&request, 6); + + int dataReserve = 10; + int dataReservePart = 10; + IpcIoPushInt32(&request, dataReserve); + IpcIoPushInt32(&request, dataReservePart); // send and getReply IpcIo reply; diff --git a/frameworks/abilitymgr_lite/src/abilityms_client.cpp b/frameworks/abilitymgr_lite/src/abilityms_client.cpp index d1e5e8d..408501c 100755 --- a/frameworks/abilitymgr_lite/src/abilityms_client.cpp +++ b/frameworks/abilitymgr_lite/src/abilityms_client.cpp @@ -79,7 +79,8 @@ int AbilityMsClient::ScheduleAms(const Want *want, uint64_t token, const SvcIden } IpcIo req; char data[IPC_IO_DATA_MAX]; - IpcIoInit(&req, data, IPC_IO_DATA_MAX, 3); + int maxBufferSize = 3; + IpcIoInit(&req, data, IPC_IO_DATA_MAX, maxBufferSize); if (token != 0) { IpcIoPushUint64(&req, token); } diff --git a/frameworks/abilitymgr_lite/src/slite/ability_manager_inner.cpp b/frameworks/abilitymgr_lite/src/slite/ability_manager_inner.cpp index 1b75fbc..02567af 100755 --- a/frameworks/abilitymgr_lite/src/slite/ability_manager_inner.cpp +++ b/frameworks/abilitymgr_lite/src/slite/ability_manager_inner.cpp @@ -47,7 +47,7 @@ StartCheckFunc getAbilityCallback() return CALLBACKFUNC; } -void setCleanAbilityDataFlag(bool cleanFlag) +void setCleanAbilityDataFlag(bool cleanFlag) { cleanAbilityDataFlag = cleanFlag; } diff --git a/frameworks/want_lite/src/want.cpp b/frameworks/want_lite/src/want.cpp index 2178ce7..d8bad76 100644 --- a/frameworks/want_lite/src/want.cpp +++ b/frameworks/want_lite/src/want.cpp @@ -101,9 +101,10 @@ Tlv *EncapTlv(uint8_t type, uint8_t length, const void *value, uint8_t valueLen) return nullptr; } + int safeLength = 2; if (memcpy_s((unsigned char *)entity, 1, &type, 1) != 0 || memcpy_s((unsigned char *)entity + 1, 1, &length, 1) != 0 || - memcpy_s((unsigned char *)entity + 2, valueLen, value, valueLen) != 0) { + memcpy_s((unsigned char *)entity + safeLength, valueLen, value, valueLen) != 0) { AdapterFree(entity); return nullptr; } @@ -179,10 +180,13 @@ bool SetIntParam(Want *want, const char *key, uint8_t keyLen, int32_t value) FreeTlvStruct(keyTlv); return result; } + int intBufferbNumber = 4; + int rightShiftSize = 8; + int rightShiftOffset = 3; unsigned char intBuffer[4] = {0}; for (int i = 0; i < intBufferbNumber; i++) { - intBuffer[i] = value >> (8 * (3- i)); + intBuffer[i] = value >> (rightShiftSize * (rightShiftOffset - i)); } Tlv *valueTlv = EncapTlv(INT_VALUE_TYPE, sizeof(int), (void *)intBuffer, sizeof(int)); if (valueTlv == nullptr) { diff --git a/interfaces/kits/ability_lite/ability_manager.h b/interfaces/kits/ability_lite/ability_manager.h index f959f7a..581d45a 100644 --- a/interfaces/kits/ability_lite/ability_manager.h +++ b/interfaces/kits/ability_lite/ability_manager.h @@ -59,7 +59,7 @@ extern "C" { * @param resultMessage Indicates the result message returned with the status code. * */ -typedef void (*IAbilityStartCallback)(const uint8_t resultCode, const void *resultMessage); +typedef void (*IAbilityStartCallback)(const uint8_t resultCode, const void *resultMessage); /** * @brief Starts an ability based on the specified {@link Want} information. diff --git a/interfaces/kits/js/napi/js_aafwk.cpp b/interfaces/kits/js/napi/js_aafwk.cpp index 058a000..d3190aa 100644 --- a/interfaces/kits/js/napi/js_aafwk.cpp +++ b/interfaces/kits/js/napi/js_aafwk.cpp @@ -68,7 +68,7 @@ static int JSAafwkStopAbility(napi_env env, napi_callback_info info) { napi_status status; size_t argc = 1; - napi_value args[1] = {0};; + napi_value args[1] = {0}; status = napi_get_cb_info(env, info, &argc, args, NULL, NULL); assert(status == napi_ok); diff --git a/services/abilitymgr_lite/include/ability_stack.h b/services/abilitymgr_lite/include/ability_stack.h index f5df036..9e0614e 100755 --- a/services/abilitymgr_lite/include/ability_stack.h +++ b/services/abilitymgr_lite/include/ability_stack.h @@ -16,9 +16,9 @@ #ifndef OHOS_ABILITY_STACK_H #define OHOS_ABILITY_STACK_H +#include #include "ability_record.h" #include "utils_list.h" -#include namespace OHOS { class AbilityStack { diff --git a/services/abilitymgr_lite/include/util/abilityms_status.h b/services/abilitymgr_lite/include/util/abilityms_status.h index 5ef304e..94a9c52 100644 --- a/services/abilitymgr_lite/include/util/abilityms_status.h +++ b/services/abilitymgr_lite/include/util/abilityms_status.h @@ -143,25 +143,25 @@ private: #define CHECK_RESULT_LOG_CODE(status, code) \ do { \ - if (!((status).IsOk())) { \ - status.LogStatus(); \ + if (!((status).IsOk())) { \ + (status).LogStatus(); \ return code; \ } \ } while (0) -#define CHECK_RESULT_LOG(status) \ - do { \ - if (!((status).IsOk())) { \ - status.LogStatus(); \ - return; \ - } \ +#define CHECK_RESULT_LOG(status) \ + do { \ + if (!((status).IsOk())) { \ + (status).LogStatus(); \ + return; \ + } \ } while (0) -#define CHECK_RESULT(status) \ - do { \ - if (!((status).IsOk())) { \ - return status; \ - } \ +#define CHECK_RESULT(status) \ + do { \ + if (!((status).IsOk())) { \ + return status; \ + } \ } while (0) } #endif // OHOS_ABILITY_CONST_H diff --git a/services/abilitymgr_lite/unittest/test_lv0/page_ability_test/page_ability_test.cpp b/services/abilitymgr_lite/unittest/test_lv0/page_ability_test/page_ability_test.cpp index d107eec..be0de58 100644 --- a/services/abilitymgr_lite/unittest/test_lv0/page_ability_test/page_ability_test.cpp +++ b/services/abilitymgr_lite/unittest/test_lv0/page_ability_test/page_ability_test.cpp @@ -57,7 +57,7 @@ namespace OHOS { /** * @tc.name: StartAbilityTest001 * @tc.desc: test StartAbility. - * @tc.require: AR000DSMBM + * @tc.require: AR000DSMBM * @tc.type: FUNC */ HWTEST_F(PageAbilityTest, startAbility001, TestSize.Level0) diff --git a/services/abilitymgr_lite/unittest/utils/ability_test_helper.cpp b/services/abilitymgr_lite/unittest/utils/ability_test_helper.cpp index 77090bc..9459826 100644 --- a/services/abilitymgr_lite/unittest/utils/ability_test_helper.cpp +++ b/services/abilitymgr_lite/unittest/utils/ability_test_helper.cpp @@ -96,8 +96,7 @@ namespace OHOS { if (flag == LITEIPC_FLAG_ONEWAY) { FreeBuffer(nullptr, ipcMsg); } - switch (funcId) - { + switch (funcId) { case SCHEDULER_APP_INIT: { ElementName element = {}; DeserializeElement(&element, data); @@ -109,8 +108,7 @@ namespace OHOS { } case SCHEDULER_DUMP_ABILITY: { BuffPtr *buff = IpcIoPopDataBuff(data); - if ((buff == nullptr) || (buff->buff == nullptr)) - { + if ((buff == nullptr) || (buff->buff == nullptr)) { printf("ams call back error, buff is empty\n"); return false; } @@ -171,7 +169,8 @@ namespace OHOS { IpcIoInit(&req, data, IPC_IO_DATA_MAX, 0); IpcIoPushString(&req, bundleName.c_str()); int32_t ret = proxy_->Invoke(proxy_, TERMINATE_APP, &req, nullptr, nullptr); - sleep(2); + int holdTime = 2; + sleep(holdTime); return ret == EC_SUCCESS; } -- Gitee