diff --git a/frameworks/common/include/accesstoken_thread_msg.h b/frameworks/common/include/accesstoken_thread_msg.h index 306fe8870a2c28af00b5ae1966ba2af43db1d5fe..4cf9631f13bba9bc42513fe7618bb58c4fd34414 100644 --- a/frameworks/common/include/accesstoken_thread_msg.h +++ b/frameworks/common/include/accesstoken_thread_msg.h @@ -22,9 +22,9 @@ extern "C" { #endif uint32_t GetThreadErrorMsgLen(void); -const char *GetThreadErrorMsg(void); +const char* GetThreadErrorMsg(void); void ClearThreadErrorMsg(void); -void AddEventMessage(uint32_t domain, const char *tag, const char *format, ...); +void AddEventMessage(uint32_t domain, const char* tag, const char* format, ...); #ifdef __cplusplus } diff --git a/frameworks/common/include/permission_map.h b/frameworks/common/include/permission_map.h index 0dadaba12ef4363b85beb15f97c9be4cc43714b0..0cf8058651ce4bfafd4ad5fcef9022731f88f727 100644 --- a/frameworks/common/include/permission_map.h +++ b/frameworks/common/include/permission_map.h @@ -27,7 +27,7 @@ namespace OHOS { namespace Security { namespace AccessToken { struct PermissionBriefDef { - char *permissionName; + char* permissionName; GrantMode grantMode; ATokenAplEnum availableLevel; ATokenAvailableTypeEnum availableType; diff --git a/frameworks/common/src/accesstoken_common_log.cpp b/frameworks/common/src/accesstoken_common_log.cpp index 04c02c9b0c0720eda11e004a9500476a0b558524..4a9448cea4f567446f12756e81ae35bfe257bfc6 100644 --- a/frameworks/common/src/accesstoken_common_log.cpp +++ b/frameworks/common/src/accesstoken_common_log.cpp @@ -43,7 +43,7 @@ uint32_t GetThreadErrorMsgLen(void) return g_msgLen; } -const char *GetThreadErrorMsg(void) +const char* GetThreadErrorMsg(void) { return g_errMsg; } @@ -54,8 +54,8 @@ void ClearThreadErrorMsg(void) g_msgLen = 0; } -void AppendThreadErrMsg(unsigned int domain, const char *tag, - const uint8_t *buff, uint32_t buffLen) +void AppendThreadErrMsg(unsigned int domain, const char* tag, + const uint8_t* buff, uint32_t buffLen) { if (g_msgLen + buffLen >= MAX_ERROR_MESSAGE_LEN) { ACCESSTOKEN_COMMON_LOGE(domain, tag, "Buff will overflow!" @@ -70,8 +70,8 @@ void AppendThreadErrMsg(unsigned int domain, const char *tag, g_msgLen += buffLen; } -static bool ReplaceSubstring(unsigned int domain, const char *tag, - const char *format, char result[MAX_ERROR_MESSAGE_LEN]) +static bool ReplaceSubstring(unsigned int domain, const char* tag, + const char* format, char result[MAX_ERROR_MESSAGE_LEN]) { std::string formatString(format); #ifndef USE_NATIVE_TOKEN_KLOG @@ -86,8 +86,8 @@ static bool ReplaceSubstring(unsigned int domain, const char *tag, return true; } -void AddEventMessage(unsigned int domain, const char *tag, - const char *format, ...) +void AddEventMessage(unsigned int domain, const char* tag, + const char* format, ...) { va_list ap; @@ -118,7 +118,7 @@ void AddEventMessage(unsigned int domain, const char *tag, g_msgLen += static_cast(buffLen); } else { va_start(ap, format); - char *funName = va_arg(ap, char *); + char* funName = va_arg(ap, char*); uint32_t lineNo = va_arg(ap, uint32_t); va_end(ap); diff --git a/frameworks/common/src/accesstoken_klog.cpp b/frameworks/common/src/accesstoken_klog.cpp index 32804a4aa20d6c8d81fca2e2b9e1f3057a367c5c..b43c1f47dba6e1bfca17a9d1600a1895750a37e7 100644 --- a/frameworks/common/src/accesstoken_klog.cpp +++ b/frameworks/common/src/accesstoken_klog.cpp @@ -22,7 +22,7 @@ #define MAX_LOG_SIZE 1024 #define MAX_LEVEL_SIZE 3 -static const char *g_logLevelStr[] = {"ERROR", "WARNING", "INFO"}; +static const char* g_logLevelStr[] = {"ERROR", "WARNING", "INFO"}; #ifndef UNLIKELY #define UNLIKELY(x) __builtin_expect(!!(x), 0) @@ -41,7 +41,7 @@ static void NativeTokenOpenLogDevice(void) return; } -int NativeTokenKmsg(int logLevel, const char *fmt, ...) +int NativeTokenKmsg(int logLevel, const char* fmt, ...) { if ((logLevel < 0) || (logLevel >= MAX_LEVEL_SIZE)) { return -1; diff --git a/frameworks/common/src/data_validator.cpp b/frameworks/common/src/data_validator.cpp index 88b247f1b61785679f0c5d7685f171cc221020e2..ca96e2c7a0a0b27cbe7b4dae6d1f1188607a2a31 100644 --- a/frameworks/common/src/data_validator.cpp +++ b/frameworks/common/src/data_validator.cpp @@ -229,7 +229,7 @@ bool DataValidator::IsNativeCaller(AccessTokenID id) bool DataValidator::IsHapCaller(AccessTokenID id) { - AccessTokenIDInner *idInner = reinterpret_cast(&id); + AccessTokenIDInner* idInner = reinterpret_cast(&id); ATokenTypeEnum type = static_cast(idInner->type); if (type != TOKEN_HAP) { LOGE(ATM_DOMAIN, ATM_TAG, "Not hap(%{public}d).", id); diff --git a/frameworks/common/src/permission_map.cpp b/frameworks/common/src/permission_map.cpp index 9adb6fcdf12a22289a950e185f4a34ddcf95b293..8b49b5d29152db9edad5c231d22baa0a0e286ed4 100644 --- a/frameworks/common/src/permission_map.cpp +++ b/frameworks/common/src/permission_map.cpp @@ -29,8 +29,8 @@ static std::mutex g_lockPermMap; class CharArrayCompare { public: CharArrayCompare() {}; - - bool operator() (const char *str1, const char *str2) const + + bool operator() (const char* str1, const char* str2) const { if (str1 == str2) { return false; diff --git a/frameworks/ets/ani/accesstoken/src/ani_ability_access_ctrl.cpp b/frameworks/ets/ani/accesstoken/src/ani_ability_access_ctrl.cpp index 12785128357ad297fdfb7f7d7b1323268a563613..f11b544c526e3ef31d9dcb1ca160a99040cbb5ea 100644 --- a/frameworks/ets/ani/accesstoken/src/ani_ability_access_ctrl.cpp +++ b/frameworks/ets/ani/accesstoken/src/ani_ability_access_ctrl.cpp @@ -810,7 +810,7 @@ static void UnregisterPermStateChangeCallback([[maybe_unused]] ani_env* env, [[m return; } -static ani_status AtManagerBindNativeFunction(ani_env *env, ani_class& cls) +static ani_status AtManagerBindNativeFunction(ani_env* env, ani_class& cls) { std::array clsMethods = { ani_native_function { "checkAccessTokenExecute", nullptr, reinterpret_cast(CheckAccessTokenExecute) }, @@ -828,20 +828,20 @@ static ani_status AtManagerBindNativeFunction(ani_env *env, ani_class& cls) ani_native_function { "getPermissionsStatusExecute", nullptr, reinterpret_cast(GetPermissionsStatusExecute) }, ani_native_function{ "getPermissionFlagsExecute", - nullptr, reinterpret_cast(GetPermissionFlagsExecute) }, + nullptr, reinterpret_cast(GetPermissionFlagsExecute) }, ani_native_function{ "setPermissionRequestToggleStatusExecute", - nullptr, reinterpret_cast(SetPermissionRequestToggleStatusExecute) }, + nullptr, reinterpret_cast(SetPermissionRequestToggleStatusExecute) }, ani_native_function{ "getPermissionRequestToggleStatusExecute", - nullptr, reinterpret_cast(GetPermissionRequestToggleStatusExecute) }, + nullptr, reinterpret_cast(GetPermissionRequestToggleStatusExecute) }, ani_native_function{ "requestAppPermOnSettingExecute", - nullptr, reinterpret_cast(RequestAppPermOnSettingExecute) }, + nullptr, reinterpret_cast(RequestAppPermOnSettingExecute) }, ani_native_function { "onExcute", nullptr, reinterpret_cast(RegisterPermStateChangeCallback) }, ani_native_function { "offExcute", nullptr, reinterpret_cast(UnregisterPermStateChangeCallback) }, }; return env->Class_BindNativeMethods(cls, clsMethods.data(), clsMethods.size()); } -ani_status InitAbilityCtrlFunction(ani_env *env) +ani_status InitAbilityCtrlFunction(ani_env* env) { if (env == nullptr) { LOGE(ATM_DOMAIN, ATM_TAG, "Env is null."); diff --git a/frameworks/js/napi/accesstoken/src/napi_atmanager.cpp b/frameworks/js/napi/accesstoken/src/napi_atmanager.cpp index d0279afb67294895798f604e0050f631f6583238..fb9699a2e6fc55e6f54d2d6660f5d7ae13916f00 100644 --- a/frameworks/js/napi/accesstoken/src/napi_atmanager.cpp +++ b/frameworks/js/napi/accesstoken/src/napi_atmanager.cpp @@ -49,7 +49,7 @@ constexpr uint32_t FORTH_PARAM = 3; static void ReturnPromiseResult(napi_env env, const AtManagerAsyncContext& context, napi_value result) { if (context.errorCode != RET_SUCCESS) { - int32_t jsCode = NapiContextCommon::GetJsErrorCode(context.errorCode); + int32_t jsCode = GetJsErrorCode(context.errorCode); napi_value businessError = GenerateBusinessError(env, jsCode, GetErrorMessage(jsCode, context.extErrorMsg)); NAPI_CALL_RETURN_VOID(env, napi_reject_deferred(env, context.deferred, businessError)); } else { @@ -61,7 +61,7 @@ static void ReturnCallbackResult(napi_env env, const AtManagerAsyncContext& cont { napi_value businessError = GetNapiNull(env); if (context.errorCode != RET_SUCCESS) { - int32_t jsCode = NapiContextCommon::GetJsErrorCode(context.errorCode); + int32_t jsCode = GetJsErrorCode(context.errorCode); businessError = GenerateBusinessError(env, jsCode, GetErrorMessage(jsCode, context.extErrorMsg)); } napi_value results[ASYNC_CALL_BACK_VALUES_NUM] = { businessError, result }; @@ -93,7 +93,7 @@ static bool ConvertPermStateChangeInfo(napi_env env, napi_value value, const Per static void NotifyPermStateChanged(RegisterPermStateChangeWorker* registerPermStateChangeData) { - napi_value result = {nullptr}; + napi_value result = { nullptr }; NAPI_CALL_RETURN_VOID(registerPermStateChangeData->env, napi_create_object(registerPermStateChangeData->env, &result)); if (!ConvertPermStateChangeInfo(registerPermStateChangeData->env, @@ -208,7 +208,7 @@ void RegisterPermStateChangeScopePtr::DeleteNapiRef() } } -void NapiAtManager::SetNamedProperty(napi_env env, napi_value dstObj, const int32_t objValue, const char *propName) +void NapiAtManager::SetNamedProperty(napi_env env, napi_value dstObj, const int32_t objValue, const char* propName) { napi_value prop = nullptr; napi_create_int32(env, objValue, &prop); @@ -327,14 +327,14 @@ napi_value NapiAtManager::CreateAtManager(napi_env env, napi_callback_info cbInf bool NapiAtManager::ParseInputVerifyPermissionOrGetFlag(const napi_env env, const napi_callback_info info, AtManagerAsyncContext& asyncContext) { - size_t argc = NapiContextCommon::MAX_PARAMS_TWO; + size_t argc = MAX_PARAMS_TWO; - napi_value argv[NapiContextCommon::MAX_PARAMS_TWO] = { nullptr }; + napi_value argv[MAX_PARAMS_TWO] = { nullptr }; napi_value thisVar = nullptr; std::string errMsg; - void *data = nullptr; + void* data = nullptr; NAPI_CALL_BASE(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, &data), false); - if (argc < NapiContextCommon::MAX_PARAMS_TWO) { + if (argc < MAX_PARAMS_TWO) { NAPI_CALL_BASE(env, napi_throw(env, GenerateBusinessError(env, JsErrorCode::JS_ERROR_PARAM_ILLEGAL, "Parameter is missing.")), false); return false; @@ -364,14 +364,14 @@ bool NapiAtManager::ParseInputVerifyPermissionOrGetFlag(const napi_env env, cons bool NapiAtManager::ParseInputVerifyPermissionSync(const napi_env env, const napi_callback_info info, AtManagerSyncContext& syncContext) { - size_t argc = NapiContextCommon::MAX_PARAMS_TWO; + size_t argc = MAX_PARAMS_TWO; - napi_value argv[NapiContextCommon::MAX_PARAMS_TWO] = { nullptr }; + napi_value argv[MAX_PARAMS_TWO] = { nullptr }; napi_value thisVar = nullptr; std::string errMsg; - void *data = nullptr; + void* data = nullptr; NAPI_CALL_BASE(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, &data), false); - if (argc < NapiContextCommon::MAX_PARAMS_TWO) { + if (argc < MAX_PARAMS_TWO) { NAPI_CALL_BASE(env, napi_throw(env, GenerateBusinessError(env, JsErrorCode::JS_ERROR_PARAM_ILLEGAL, "Parameter is missing.")), false); return false; @@ -398,9 +398,9 @@ bool NapiAtManager::ParseInputVerifyPermissionSync(const napi_env env, const nap return true; } -void NapiAtManager::VerifyAccessTokenExecute(napi_env env, void *data) +void NapiAtManager::VerifyAccessTokenExecute(napi_env env, void* data) { - AtManagerAsyncContext* asyncContext = reinterpret_cast(data); + AtManagerAsyncContext* asyncContext = reinterpret_cast(data); if (asyncContext == nullptr) { return; } @@ -417,9 +417,9 @@ void NapiAtManager::VerifyAccessTokenExecute(napi_env env, void *data) asyncContext->result = AccessTokenKit::VerifyAccessToken(asyncContext->tokenId, asyncContext->permissionName); } -void NapiAtManager::VerifyAccessTokenComplete(napi_env env, napi_status status, void *data) +void NapiAtManager::VerifyAccessTokenComplete(napi_env env, napi_status status, void* data) { - AtManagerAsyncContext* asyncContext = reinterpret_cast(data); + AtManagerAsyncContext* asyncContext = reinterpret_cast(data); if (asyncContext == nullptr) { LOGE(ATM_DOMAIN, ATM_TAG, "AsyncContext is null."); return; @@ -458,7 +458,7 @@ napi_value NapiAtManager::VerifyAccessToken(napi_env env, napi_callback_info inf NAPI_CALL(env, napi_create_async_work( env, nullptr, resources, VerifyAccessTokenExecute, VerifyAccessTokenComplete, - reinterpret_cast(asyncContext), &(asyncContext->work))); + reinterpret_cast(asyncContext), &(asyncContext->work))); NAPI_CALL(env, napi_queue_async_work_with_qos(env, asyncContext->work, napi_qos_default)); LOGD(ATM_DOMAIN, ATM_TAG, "VerifyAccessToken end."); @@ -466,12 +466,12 @@ napi_value NapiAtManager::VerifyAccessToken(napi_env env, napi_callback_info inf return result; } -void NapiAtManager::CheckAccessTokenExecute(napi_env env, void *data) +void NapiAtManager::CheckAccessTokenExecute(napi_env env, void* data) { if (data == nullptr) { return; } - AtManagerAsyncContext* asyncContext = reinterpret_cast(data); + AtManagerAsyncContext* asyncContext = reinterpret_cast(data); if (asyncContext == nullptr) { return; } @@ -481,7 +481,7 @@ void NapiAtManager::CheckAccessTokenExecute(napi_env env, void *data) return; } if ((asyncContext->permissionName.empty()) || - ((asyncContext->permissionName.length() > NapiContextCommon::MAX_LENGTH))) { + ((asyncContext->permissionName.length() > MAX_LENGTH))) { asyncContext->errorCode = JS_ERROR_PARAM_INVALID; asyncContext->extErrorMsg = "The permission name is empty or exceeds 256 characters."; return; @@ -501,10 +501,10 @@ void NapiAtManager::CheckAccessTokenExecute(napi_env env, void *data) asyncContext->permissionName); } -void NapiAtManager::CheckAccessTokenComplete(napi_env env, napi_status status, void *data) +void NapiAtManager::CheckAccessTokenComplete(napi_env env, napi_status status, void* data) __attribute__((no_sanitize("cfi"))) { - AtManagerAsyncContext* asyncContext = reinterpret_cast(data); + AtManagerAsyncContext* asyncContext = reinterpret_cast(data); if (asyncContext == nullptr) { LOGE(ATM_DOMAIN, ATM_TAG, "AsyncContext is null."); return; @@ -539,7 +539,7 @@ napi_value NapiAtManager::CheckAccessToken(napi_env env, napi_callback_info info NAPI_CALL(env, napi_create_async_work( env, nullptr, resource, CheckAccessTokenExecute, CheckAccessTokenComplete, - reinterpret_cast(asyncContext), &(asyncContext->work))); + reinterpret_cast(asyncContext), &(asyncContext->work))); NAPI_CALL(env, napi_queue_async_work_with_qos(env, asyncContext->work, napi_qos_default)); LOGD(ATM_DOMAIN, ATM_TAG, "CheckAccessToken end."); @@ -566,8 +566,8 @@ std::string NapiAtManager::GetPermParamValue(PermissionParamCache& paramCache, c int32_t currCommitId = static_cast(GetParameterCommitId(paramCache.handle)); if (currCommitId != paramCache.commitIdCache) { - char value[NapiContextCommon::VALUE_MAX_LEN] = {0}; - auto ret = GetParameterValue(paramCache.handle, value, NapiContextCommon::VALUE_MAX_LEN - 1); + char value[VALUE_MAX_LEN] = {0}; + auto ret = GetParameterValue(paramCache.handle, value, VALUE_MAX_LEN - 1); if (ret < 0) { LOGE(ATM_DOMAIN, ATM_TAG, "Return default value, ret=%{public}d", ret); return "-1"; @@ -622,7 +622,7 @@ napi_value NapiAtManager::VerifyAccessTokenSync(napi_env env, napi_callback_info return nullptr; } if ((syncContext->permissionName.empty()) || - ((syncContext->permissionName.length() > NapiContextCommon::MAX_LENGTH))) { + ((syncContext->permissionName.length() > MAX_LENGTH))) { std::string errMsg = GetErrorMessage( JS_ERROR_PARAM_INVALID, "The permissionName is empty or exceeds 256 characters."); NAPI_CALL(env, napi_throw(env, GenerateBusinessError(env, JS_ERROR_PARAM_INVALID, errMsg))); @@ -652,14 +652,14 @@ napi_value NapiAtManager::VerifyAccessTokenSync(napi_env env, napi_callback_info bool NapiAtManager::ParseInputGrantOrRevokePermission(const napi_env env, const napi_callback_info info, AtManagerAsyncContext& asyncContext) { - size_t argc = NapiContextCommon::MAX_PARAMS_FOUR; - napi_value argv[NapiContextCommon::MAX_PARAMS_FOUR] = {nullptr}; + size_t argc = MAX_PARAMS_FOUR; + napi_value argv[MAX_PARAMS_FOUR] = { nullptr }; napi_value thatVar = nullptr; - void *data = nullptr; + void* data = nullptr; NAPI_CALL_BASE(env, napi_get_cb_info(env, info, &argc, argv, &thatVar, &data), false); // 1: grant and revoke required minnum argc - if (argc < NapiContextCommon::MAX_PARAMS_FOUR - 1) { + if (argc < MAX_PARAMS_FOUR - 1) { NAPI_CALL_BASE(env, napi_throw(env, GenerateBusinessError(env, JsErrorCode::JS_ERROR_PARAM_ILLEGAL, "Parameter is missing.")), false); return false; @@ -690,7 +690,7 @@ bool NapiAtManager::ParseInputGrantOrRevokePermission(const napi_env env, const return false; } - if (argc == NapiContextCommon::MAX_PARAMS_FOUR) { + if (argc == MAX_PARAMS_FOUR) { // 3: the fourth parameter of argv if ((!IsUndefinedOrNull(env, argv[3])) && (!ParseCallback(env, argv[3], asyncContext.callbackRef))) { NAPI_CALL_BASE(env, napi_throw(env, GenerateBusinessError(env, JsErrorCode::JS_ERROR_PARAM_ILLEGAL, @@ -704,9 +704,9 @@ bool NapiAtManager::ParseInputGrantOrRevokePermission(const napi_env env, const return true; } -void NapiAtManager::GrantUserGrantedPermissionExecute(napi_env env, void *data) +void NapiAtManager::GrantUserGrantedPermissionExecute(napi_env env, void* data) { - AtManagerAsyncContext* asyncContext = reinterpret_cast(data); + AtManagerAsyncContext* asyncContext = reinterpret_cast(data); if (asyncContext == nullptr) { return; } @@ -743,7 +743,7 @@ void NapiAtManager::GrantUserGrantedPermissionExecute(napi_env env, void *data) asyncContext->tokenId, asyncContext->permissionName.c_str(), asyncContext->flag, asyncContext->errorCode); } -void NapiAtManager::GrantUserGrantedPermissionComplete(napi_env env, napi_status status, void *data) +void NapiAtManager::GrantUserGrantedPermissionComplete(napi_env env, napi_status status, void* data) { AtManagerAsyncContext* context = reinterpret_cast(data); if (context == nullptr) { @@ -778,7 +778,7 @@ napi_value NapiAtManager::GetVersion(napi_env env, napi_callback_info info) NAPI_CALL(env, napi_create_string_utf8(env, "GetVersion", NAPI_AUTO_LENGTH, &resource)); NAPI_CALL(env, napi_create_async_work(env, nullptr, resource, GetVersionExecute, GetVersionComplete, - reinterpret_cast(asyncContext), &(asyncContext->work))); + reinterpret_cast(asyncContext), &(asyncContext->work))); NAPI_CALL(env, napi_queue_async_work_with_qos(env, asyncContext->work, napi_qos_default)); context.release(); @@ -786,9 +786,9 @@ napi_value NapiAtManager::GetVersion(napi_env env, napi_callback_info info) return result; } -void NapiAtManager::GetVersionExecute(napi_env env, void *data) +void NapiAtManager::GetVersionExecute(napi_env env, void* data) { - AtManagerAsyncContext* asyncContext = reinterpret_cast(data); + AtManagerAsyncContext* asyncContext = reinterpret_cast(data); if (asyncContext == nullptr) { return; } @@ -802,9 +802,9 @@ void NapiAtManager::GetVersionExecute(napi_env env, void *data) LOGD(ATM_DOMAIN, ATM_TAG, "Version result = %{public}d.", asyncContext->result); } -void NapiAtManager::GetVersionComplete(napi_env env, napi_status status, void *data) +void NapiAtManager::GetVersionComplete(napi_env env, napi_status status, void* data) { - AtManagerAsyncContext* asyncContext = reinterpret_cast(data); + AtManagerAsyncContext* asyncContext = reinterpret_cast(data); if (asyncContext == nullptr) { LOGE(ATM_DOMAIN, ATM_TAG, "AsyncContext is null."); return; @@ -846,7 +846,7 @@ napi_value NapiAtManager::GrantUserGrantedPermission(napi_env env, napi_callback NAPI_CALL(env, napi_create_async_work( env, nullptr, resource, GrantUserGrantedPermissionExecute, GrantUserGrantedPermissionComplete, - reinterpret_cast(context), &(context->work))); + reinterpret_cast(context), &(context->work))); NAPI_CALL(env, napi_queue_async_work_with_qos(env, context->work, napi_qos_default)); @@ -855,9 +855,9 @@ napi_value NapiAtManager::GrantUserGrantedPermission(napi_env env, napi_callback return result; } -void NapiAtManager::RevokeUserGrantedPermissionExecute(napi_env env, void *data) +void NapiAtManager::RevokeUserGrantedPermissionExecute(napi_env env, void* data) { - AtManagerAsyncContext* asyncContext = reinterpret_cast(data); + AtManagerAsyncContext* asyncContext = reinterpret_cast(data); if (asyncContext == nullptr) { return; } @@ -894,7 +894,7 @@ void NapiAtManager::RevokeUserGrantedPermissionExecute(napi_env env, void *data) asyncContext->tokenId, asyncContext->permissionName.c_str(), asyncContext->flag, asyncContext->errorCode); } -void NapiAtManager::RevokeUserGrantedPermissionComplete(napi_env env, napi_status status, void *data) +void NapiAtManager::RevokeUserGrantedPermissionComplete(napi_env env, napi_status status, void* data) { AtManagerAsyncContext* asyncContext = reinterpret_cast(data); std::unique_ptr callbackPtr {asyncContext}; @@ -935,7 +935,7 @@ napi_value NapiAtManager::RevokeUserGrantedPermission(napi_env env, napi_callbac NAPI_CALL(env, napi_create_async_work( env, nullptr, resource, RevokeUserGrantedPermissionExecute, RevokeUserGrantedPermissionComplete, - reinterpret_cast(asyncContext), &(asyncContext->work))); + reinterpret_cast(asyncContext), &(asyncContext->work))); NAPI_CALL(env, napi_queue_async_work_with_qos(env, asyncContext->work, napi_qos_default)); LOGD(ATM_DOMAIN, ATM_TAG, "RevokeUserGrantedPermission end."); @@ -943,7 +943,7 @@ napi_value NapiAtManager::RevokeUserGrantedPermission(napi_env env, napi_callbac return result; } -void NapiAtManager::GetPermissionFlagsExecute(napi_env env, void *data) +void NapiAtManager::GetPermissionFlagsExecute(napi_env env, void* data) { AtManagerAsyncContext* asyncContext = reinterpret_cast(data); if (asyncContext == nullptr) { @@ -955,7 +955,7 @@ void NapiAtManager::GetPermissionFlagsExecute(napi_env env, void *data) asyncContext->permissionName, asyncContext->flag); } -void NapiAtManager::GetPermissionFlagsComplete(napi_env env, napi_status status, void *data) +void NapiAtManager::GetPermissionFlagsComplete(napi_env env, napi_status status, void* data) { AtManagerAsyncContext* asyncContext = reinterpret_cast(data); if (asyncContext == nullptr) { @@ -993,7 +993,7 @@ napi_value NapiAtManager::GetPermissionFlags(napi_env env, napi_callback_info in // define work napi_create_async_work( env, nullptr, resource, GetPermissionFlagsExecute, GetPermissionFlagsComplete, - reinterpret_cast(asyncContext), &(asyncContext->work)); + reinterpret_cast(asyncContext), &(asyncContext->work)); // add async work handle to the napi queue and wait for result napi_queue_async_work_with_qos(env, asyncContext->work, napi_qos_default); @@ -1005,14 +1005,14 @@ napi_value NapiAtManager::GetPermissionFlags(napi_env env, napi_callback_info in bool NapiAtManager::ParseInputSetToggleStatus(const napi_env env, const napi_callback_info info, AtManagerAsyncContext& asyncContext) { - size_t argc = NapiContextCommon::MAX_PARAMS_TWO; - napi_value argv[NapiContextCommon::MAX_PARAMS_TWO] = { nullptr }; + size_t argc = MAX_PARAMS_TWO; + napi_value argv[MAX_PARAMS_TWO] = { nullptr }; napi_value thisVar = nullptr; - void *data = nullptr; + void* data = nullptr; std::string errMsg; NAPI_CALL_BASE(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, &data), false); - if (argc < NapiContextCommon::MAX_PARAMS_TWO) { + if (argc < MAX_PARAMS_TWO) { NAPI_CALL_BASE(env, napi_throw(env, GenerateBusinessError(env, JsErrorCode::JS_ERROR_PARAM_ILLEGAL, "Parameter is missing.")), false); return false; @@ -1040,14 +1040,14 @@ bool NapiAtManager::ParseInputSetToggleStatus(const napi_env env, const napi_cal bool NapiAtManager::ParseInputGetToggleStatus(const napi_env env, const napi_callback_info info, AtManagerAsyncContext& asyncContext) { - size_t argc = NapiContextCommon::MAX_PARAMS_ONE; + size_t argc = MAX_PARAMS_ONE; - napi_value argv[NapiContextCommon::MAX_PARAMS_ONE] = { nullptr }; + napi_value argv[MAX_PARAMS_ONE] = { nullptr }; napi_value thisVar = nullptr; std::string errMsg; - void *data = nullptr; + void* data = nullptr; NAPI_CALL_BASE(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, &data), false); - if (argc < NapiContextCommon::MAX_PARAMS_ONE) { + if (argc < MAX_PARAMS_ONE) { NAPI_CALL_BASE(env, napi_throw(env, GenerateBusinessError(env, JsErrorCode::JS_ERROR_PARAM_ILLEGAL, "Parameter is missing.")), false); return false; @@ -1064,7 +1064,7 @@ bool NapiAtManager::ParseInputGetToggleStatus(const napi_env env, const napi_cal return true; } -void NapiAtManager::SetPermissionRequestToggleStatusExecute(napi_env env, void *data) +void NapiAtManager::SetPermissionRequestToggleStatusExecute(napi_env env, void* data) { AtManagerAsyncContext* asyncContext = reinterpret_cast(data); if (asyncContext == nullptr) { @@ -1076,7 +1076,7 @@ void NapiAtManager::SetPermissionRequestToggleStatusExecute(napi_env env, void * asyncContext->status, 0); } -void NapiAtManager::SetPermissionRequestToggleStatusComplete(napi_env env, napi_status status, void *data) +void NapiAtManager::SetPermissionRequestToggleStatusComplete(napi_env env, napi_status status, void* data) { AtManagerAsyncContext* asyncContext = reinterpret_cast(data); if (asyncContext == nullptr) { @@ -1091,7 +1091,7 @@ void NapiAtManager::SetPermissionRequestToggleStatusComplete(napi_env env, napi_ ReturnPromiseResult(env, *asyncContext, result); } -void NapiAtManager::GetPermissionRequestToggleStatusExecute(napi_env env, void *data) +void NapiAtManager::GetPermissionRequestToggleStatusExecute(napi_env env, void* data) { AtManagerAsyncContext* asyncContext = reinterpret_cast(data); if (asyncContext == nullptr) { @@ -1103,7 +1103,7 @@ void NapiAtManager::GetPermissionRequestToggleStatusExecute(napi_env env, void * asyncContext->status, 0); } -void NapiAtManager::GetPermissionRequestToggleStatusComplete(napi_env env, napi_status status, void *data) +void NapiAtManager::GetPermissionRequestToggleStatusComplete(napi_env env, napi_status status, void* data) { AtManagerAsyncContext* asyncContext = reinterpret_cast(data); if (asyncContext == nullptr) { @@ -1141,7 +1141,7 @@ napi_value NapiAtManager::SetPermissionRequestToggleStatus(napi_env env, napi_ca NAPI_CALL(env, napi_create_async_work( env, nullptr, resource, SetPermissionRequestToggleStatusExecute, SetPermissionRequestToggleStatusComplete, - reinterpret_cast(asyncContext), &(asyncContext->work))); + reinterpret_cast(asyncContext), &(asyncContext->work))); // add async work handle to the napi queue and wait for result NAPI_CALL(env, napi_queue_async_work_with_qos(env, asyncContext->work, napi_qos_default)); @@ -1173,7 +1173,7 @@ napi_value NapiAtManager::GetPermissionRequestToggleStatus(napi_env env, napi_ca NAPI_CALL(env, napi_create_async_work( env, nullptr, resource, GetPermissionRequestToggleStatusExecute, GetPermissionRequestToggleStatusComplete, - reinterpret_cast(asyncContext), &(asyncContext->work))); + reinterpret_cast(asyncContext), &(asyncContext->work))); // add async work handle to the napi queue and wait for result NAPI_CALL(env, napi_queue_async_work_with_qos(env, asyncContext->work, napi_qos_default)); @@ -1225,7 +1225,7 @@ bool NapiAtManager::FillPermStateChangeScope(const napi_env env, const napi_valu return true; } -void NapiAtManager::RequestAppPermOnSettingExecute(napi_env env, void *data) +void NapiAtManager::RequestAppPermOnSettingExecute(napi_env env, void* data) { AtManagerAsyncContext* asyncContext = reinterpret_cast(data); if (asyncContext == nullptr) { @@ -1234,7 +1234,7 @@ void NapiAtManager::RequestAppPermOnSettingExecute(napi_env env, void *data) asyncContext->errorCode = AccessTokenKit::RequestAppPermOnSetting(asyncContext->tokenId); } -void NapiAtManager::RequestAppPermOnSettingComplete(napi_env env, napi_status status, void *data) +void NapiAtManager::RequestAppPermOnSettingComplete(napi_env env, napi_status status, void* data) { AtManagerAsyncContext* asyncContext = reinterpret_cast(data); if (asyncContext == nullptr) { @@ -1258,13 +1258,13 @@ napi_value NapiAtManager::RequestAppPermOnSetting(napi_env env, napi_callback_in } std::unique_ptr context {asyncContext}; - size_t argc = NapiContextCommon::MAX_PARAMS_ONE; - napi_value argv[NapiContextCommon::MAX_PARAMS_ONE] = {nullptr}; + size_t argc = MAX_PARAMS_ONE; + napi_value argv[MAX_PARAMS_ONE] = { nullptr }; napi_value thatVar = nullptr; - void *data = nullptr; + void* data = nullptr; NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thatVar, &data)); - if (argc < NapiContextCommon::MAX_PARAMS_ONE) { + if (argc < MAX_PARAMS_ONE) { NAPI_CALL(env, napi_throw(env, GenerateBusinessError(env, JsErrorCode::JS_ERROR_PARAM_ILLEGAL, "Parameter is missing."))); return nullptr; @@ -1286,7 +1286,7 @@ napi_value NapiAtManager::RequestAppPermOnSetting(napi_env env, napi_callback_in NAPI_CALL(env, napi_create_async_work(env, nullptr, resource, RequestAppPermOnSettingExecute, RequestAppPermOnSettingComplete, - reinterpret_cast(asyncContext), &(asyncContext->work))); + reinterpret_cast(asyncContext), &(asyncContext->work))); NAPI_CALL(env, napi_queue_async_work_with_qos(env, asyncContext->work, napi_qos_default)); @@ -1298,13 +1298,13 @@ napi_value NapiAtManager::RequestAppPermOnSetting(napi_env env, napi_callback_in bool NapiAtManager::ParseInputGetPermStatus(const napi_env env, const napi_callback_info info, AtManagerSyncContext& syncContext) { - size_t argc = NapiContextCommon::MAX_PARAMS_ONE; - napi_value argv[NapiContextCommon::MAX_PARAMS_ONE] = {nullptr}; + size_t argc = MAX_PARAMS_ONE; + napi_value argv[MAX_PARAMS_ONE] = { nullptr }; napi_value thisVar = nullptr; - void *data = nullptr; + void* data = nullptr; NAPI_CALL_BASE(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, &data), false); - if (argc < NapiContextCommon::MAX_PARAMS_ONE) { + if (argc < MAX_PARAMS_ONE) { NAPI_CALL_BASE(env, napi_throw(env, GenerateBusinessError(env, JsErrorCode::JS_ERROR_PARAM_ILLEGAL, "Parameter is missing.")), false); return false; @@ -1334,7 +1334,7 @@ napi_value NapiAtManager::GetSelfPermissionStatusSync(napi_env env, napi_callbac } if ((syncContext->permissionName.empty()) || - ((syncContext->permissionName.length() > NapiContextCommon::MAX_LENGTH))) { + ((syncContext->permissionName.length() > MAX_LENGTH))) { std::string errMsg = GetErrorMessage( JS_ERROR_PARAM_INVALID, "The permissionName is empty or exceeds 256 characters."); NAPI_CALL(env, napi_throw(env, GenerateBusinessError(env, JS_ERROR_PARAM_INVALID, errMsg))); @@ -1365,7 +1365,7 @@ napi_value NapiAtManager::GetSelfPermissionStatusSync(napi_env env, napi_callbac } if (syncContext->result != RET_SUCCESS) { - int32_t jsCode = NapiContextCommon::GetJsErrorCode(syncContext->result); + int32_t jsCode = GetJsErrorCode(syncContext->result); NAPI_CALL(env, napi_throw(env, GenerateBusinessError(env, jsCode, GetErrorMessage(jsCode)))); return nullptr; } @@ -1409,7 +1409,7 @@ bool NapiAtManager::FillPermStateChangeInfo(const napi_env env, const napi_value return false; } napi_status status = napi_wrap(env, thisVar, reinterpret_cast(subscriber), - [](napi_env nev, void *data, void *hint) { + [](napi_env nev, void* data, void* hint) { std::shared_ptr* subscriber = static_cast*>(data); if (subscriber != nullptr && *subscriber != nullptr) { @@ -1430,8 +1430,8 @@ bool NapiAtManager::FillPermStateChangeInfo(const napi_env env, const napi_value bool NapiAtManager::ParseInputToRegister(const napi_env env, const napi_callback_info cbInfo, RegisterPermStateChangeInfo& registerPermStateChangeInfo) { - size_t argc = NapiContextCommon::MAX_PARAMS_FOUR; - napi_value argv[NapiContextCommon::MAX_PARAMS_FOUR] = {nullptr}; + size_t argc = MAX_PARAMS_FOUR; + napi_value argv[MAX_PARAMS_FOUR] = { nullptr }; napi_value thisVar = nullptr; NAPI_CALL_BASE(env, napi_get_cb_info(env, cbInfo, &argc, argv, &thisVar, nullptr), false); if (thisVar == nullptr) { @@ -1448,11 +1448,11 @@ bool NapiAtManager::ParseInputToRegister(const napi_env env, const napi_callback if (!GetPermStateChangeType(env, argc, argv, type)) { return false; } - if ((type == REGISTER_SELF_PERMISSION_STATE_CHANGE_TYPE) && (argc < NapiContextCommon::MAX_PARAMS_THREE)) { + if ((type == REGISTER_SELF_PERMISSION_STATE_CHANGE_TYPE) && (argc < MAX_PARAMS_THREE)) { napi_throw(env, GenerateBusinessError(env, JsErrorCode::JS_ERROR_PARAM_ILLEGAL, "Parameter is missing.")); return false; } - if ((type == REGISTER_PERMISSION_STATE_CHANGE_TYPE) && (argc < NapiContextCommon::MAX_PARAMS_FOUR)) { + if ((type == REGISTER_PERMISSION_STATE_CHANGE_TYPE) && (argc < MAX_PARAMS_FOUR)) { napi_throw(env, GenerateBusinessError(env, JsErrorCode::JS_ERROR_PARAM_ILLEGAL, "Parameter is missing.")); return false; } @@ -1498,7 +1498,7 @@ napi_value NapiAtManager::RegisterPermStateChangeCallback(napi_env env, napi_cal if (result != RET_SUCCESS) { LOGE(ATM_DOMAIN, ATM_TAG, "RegisterPermStateChangeCallback failed"); registerPermStateChangeInfo->errCode = result; - int32_t jsCode = NapiContextCommon::GetJsErrorCode(result); + int32_t jsCode = GetJsErrorCode(result); std::string errMsg = GetErrorMessage(jsCode); NAPI_CALL(env, napi_throw(env, GenerateBusinessError(env, jsCode, errMsg))); return nullptr; @@ -1516,8 +1516,8 @@ napi_value NapiAtManager::RegisterPermStateChangeCallback(napi_env env, napi_cal bool NapiAtManager::ParseInputToUnregister(const napi_env env, napi_callback_info cbInfo, UnregisterPermStateChangeInfo& unregisterPermStateChangeInfo) { - size_t argc = NapiContextCommon::MAX_PARAMS_FOUR; - napi_value argv[NapiContextCommon::MAX_PARAMS_FOUR] = {nullptr}; + size_t argc = MAX_PARAMS_FOUR; + napi_value argv[MAX_PARAMS_FOUR] = { nullptr }; napi_value thisVar = nullptr; napi_ref callback = nullptr; std::string errMsg; @@ -1534,11 +1534,11 @@ bool NapiAtManager::ParseInputToUnregister(const napi_env env, napi_callback_inf if (!GetPermStateChangeType(env, argc, argv, type)) { return false; } - if ((type == REGISTER_SELF_PERMISSION_STATE_CHANGE_TYPE) && (argc < NapiContextCommon::MAX_PARAMS_THREE - 1)) { + if ((type == REGISTER_SELF_PERMISSION_STATE_CHANGE_TYPE) && (argc < MAX_PARAMS_THREE - 1)) { napi_throw(env, GenerateBusinessError(env, JsErrorCode::JS_ERROR_PARAM_ILLEGAL, "Parameter is missing.")); return false; } - if ((type == REGISTER_PERMISSION_STATE_CHANGE_TYPE) && (argc < NapiContextCommon::MAX_PARAMS_FOUR - 1)) { + if ((type == REGISTER_PERMISSION_STATE_CHANGE_TYPE) && (argc < MAX_PARAMS_FOUR - 1)) { napi_throw(env, GenerateBusinessError(env, JsErrorCode::JS_ERROR_PARAM_ILLEGAL, "Parameter is missing.")); return false; } @@ -1546,8 +1546,8 @@ bool NapiAtManager::ParseInputToUnregister(const napi_env env, napi_callback_inf if (!FillPermStateChangeScope(env, argv, type, scopeInfo)) { return false; } - if (((type == REGISTER_PERMISSION_STATE_CHANGE_TYPE) && (argc == NapiContextCommon::MAX_PARAMS_FOUR)) || - ((type == REGISTER_SELF_PERMISSION_STATE_CHANGE_TYPE) && (argc == NapiContextCommon::MAX_PARAMS_THREE))) { + if (((type == REGISTER_PERMISSION_STATE_CHANGE_TYPE) && (argc == MAX_PARAMS_FOUR)) || + ((type == REGISTER_SELF_PERMISSION_STATE_CHANGE_TYPE) && (argc == MAX_PARAMS_THREE))) { int callbackIndex = (type == REGISTER_PERMISSION_STATE_CHANGE_TYPE) ? FORTH_PARAM : THIRD_PARAM; if (!ParseCallback(env, argv[callbackIndex], callback)) { errMsg = GetParamErrorMsg("callback", "Callback"); @@ -1605,7 +1605,7 @@ napi_value NapiAtManager::UnregisterPermStateChangeCallback(napi_env env, napi_c DeleteRegisterFromVector(scopeInfo, env, item->callbackRef); } else { LOGE(ATM_DOMAIN, ATM_TAG, "Batch UnregisterPermActiveChangeCompleted failed"); - int32_t jsCode = NapiContextCommon::GetJsErrorCode(result); + int32_t jsCode = GetJsErrorCode(result); std::string errMsg = GetErrorMessage(jsCode); NAPI_CALL(env, napi_throw(env, GenerateBusinessError(env, jsCode, errMsg))); } @@ -1745,7 +1745,7 @@ static napi_module g_module = { .nm_filename = nullptr, .nm_register_func = Init, .nm_modname = "abilityAccessCtrl", - .nm_priv = static_cast(nullptr), + .nm_priv = static_cast(nullptr), .reserved = {nullptr} }; diff --git a/frameworks/js/napi/accesstoken/src/napi_context_common.cpp b/frameworks/js/napi/accesstoken/src/napi_context_common.cpp index ed4e546baa36252b08e95970ee6ea40dd969b571..69886d72628ceb17227014fa6265b99aab8ce826 100644 --- a/frameworks/js/napi/accesstoken/src/napi_context_common.cpp +++ b/frameworks/js/napi/accesstoken/src/napi_context_common.cpp @@ -19,7 +19,7 @@ namespace OHOS { namespace Security { namespace AccessToken { -int32_t NapiContextCommon::GetJsErrorCode(int32_t errCode) +int32_t GetJsErrorCode(int32_t errCode) { int32_t jsCode; switch (errCode) { diff --git a/frameworks/js/napi/accesstoken/src/napi_request_global_switch_on_setting.cpp b/frameworks/js/napi/accesstoken/src/napi_request_global_switch_on_setting.cpp index 329392fafd72c439276e69ece7d9995dc16d28b0..a1a525a867324645dadbd976e69532d118d10595 100644 --- a/frameworks/js/napi/accesstoken/src/napi_request_global_switch_on_setting.cpp +++ b/frameworks/js/napi/accesstoken/src/napi_request_global_switch_on_setting.cpp @@ -514,7 +514,7 @@ napi_value NapiRequestGlobalSwitch::RequestGlobalSwitch(napi_env env, napi_callb NAPI_CALL(env, napi_create_string_utf8(env, "RequestGlobalSwitch", NAPI_AUTO_LENGTH, &resource)); NAPI_CALL(env, napi_create_async_work( env, nullptr, resource, RequestGlobalSwitchExecute, RequestGlobalSwitchComplete, - reinterpret_cast(asyncContextHandle.get()), &(asyncContextHandle->asyncContextPtr->work))); + reinterpret_cast(asyncContextHandle.get()), &(asyncContextHandle->asyncContextPtr->work))); NAPI_CALL(env, napi_queue_async_work_with_qos(env, asyncContextHandle->asyncContextPtr->work, napi_qos_user_initiated)); @@ -527,15 +527,15 @@ napi_value NapiRequestGlobalSwitch::RequestGlobalSwitch(napi_env env, napi_callb bool NapiRequestGlobalSwitch::ParseRequestGlobalSwitch(const napi_env& env, const napi_callback_info& cbInfo, std::shared_ptr& asyncContext) { - size_t argc = NapiContextCommon::MAX_PARAMS_TWO; - napi_value argv[NapiContextCommon::MAX_PARAMS_TWO] = { nullptr }; + size_t argc = MAX_PARAMS_TWO; + napi_value argv[MAX_PARAMS_TWO] = { nullptr }; napi_value thisVar = nullptr; if (napi_get_cb_info(env, cbInfo, &argc, argv, &thisVar, nullptr) != napi_ok) { LOGE(ATM_DOMAIN, ATM_TAG, "Napi_get_cb_info failed"); return false; } - if (argc < NapiContextCommon::MAX_PARAMS_TWO) { + if (argc < MAX_PARAMS_TWO) { NAPI_CALL_BASE(env, napi_throw(env, GenerateBusinessError(env, JsErrorCode::JS_ERROR_PARAM_ILLEGAL, "Parameter is missing.")), false); return false; @@ -624,7 +624,7 @@ void NapiRequestGlobalSwitch::RequestGlobalSwitchComplete(napi_env env, napi_sta } // return error if (asyncContextHandle->asyncContextPtr->deferred != nullptr) { - int32_t jsCode = NapiContextCommon::GetJsErrorCode(asyncContextHandle->asyncContextPtr->result.errorCode); + int32_t jsCode = GetJsErrorCode(asyncContextHandle->asyncContextPtr->result.errorCode); napi_value businessError = GenerateBusinessError(env, jsCode, GetErrorMessage(jsCode)); NAPI_CALL_RETURN_VOID(env, napi_reject_deferred(env, asyncContextHandle->asyncContextPtr->deferred, businessError)); diff --git a/frameworks/js/napi/accesstoken/src/napi_request_permission.cpp b/frameworks/js/napi/accesstoken/src/napi_request_permission.cpp index 3412d62803f0b054616edc815e8c7548c0377530..2760db89c2b3a21306709d30ad30186947e60a1a 100644 --- a/frameworks/js/napi/accesstoken/src/napi_request_permission.cpp +++ b/frameworks/js/napi/accesstoken/src/napi_request_permission.cpp @@ -50,7 +50,7 @@ const std::string REQUEST_TOKEN_KEY = "ohos.ability.params.request.token"; static void ReturnPromiseResult(napi_env env, const RequestAsyncContext& context, napi_value result) { if (context.result.errorCode != RET_SUCCESS) { - int32_t jsCode = NapiContextCommon::GetJsErrorCode(context.result.errorCode); + int32_t jsCode = GetJsErrorCode(context.result.errorCode); napi_value businessError = GenerateBusinessError(env, jsCode, GetErrorMessage(jsCode, context.result.errorMsg)); NAPI_CALL_RETURN_VOID(env, napi_reject_deferred(env, context.deferred, businessError)); } else { @@ -62,7 +62,7 @@ static void ReturnCallbackResult(napi_env env, const RequestAsyncContext& contex { napi_value businessError = GetNapiNull(env); if (context.result.errorCode != RET_SUCCESS) { - int32_t jsCode = NapiContextCommon::GetJsErrorCode(context.result.errorCode); + int32_t jsCode = GetJsErrorCode(context.result.errorCode); businessError = GenerateBusinessError(env, jsCode, GetErrorMessage(jsCode, context.result.errorMsg)); } napi_value results[ASYNC_CALL_BACK_VALUES_NUM] = { businessError, result }; @@ -611,7 +611,7 @@ napi_value NapiRequestPermission::RequestPermissionsFromUser(napi_env env, napi_ NAPI_CALL(env, napi_create_string_utf8(env, "RequestPermissionsFromUser", NAPI_AUTO_LENGTH, &resource)); NAPI_CALL(env, napi_create_async_work( env, nullptr, resource, RequestPermissionsFromUserExecute, RequestPermissionsFromUserComplete, - reinterpret_cast(asyncContextHandle.get()), &(asyncContextHandle->asyncContextPtr->work))); + reinterpret_cast(asyncContextHandle.get()), &(asyncContextHandle->asyncContextPtr->work))); NAPI_CALL(env, napi_queue_async_work_with_qos(env, asyncContextHandle->asyncContextPtr->work, napi_qos_user_initiated)); @@ -624,15 +624,15 @@ napi_value NapiRequestPermission::RequestPermissionsFromUser(napi_env env, napi_ bool NapiRequestPermission::ParseRequestPermissionFromUser(const napi_env& env, const napi_callback_info& cbInfo, std::shared_ptr& asyncContext) { - size_t argc = NapiContextCommon::MAX_PARAMS_THREE; - napi_value argv[NapiContextCommon::MAX_PARAMS_THREE] = { nullptr }; + size_t argc = MAX_PARAMS_THREE; + napi_value argv[MAX_PARAMS_THREE] = { nullptr }; napi_value thisVar = nullptr; if (napi_get_cb_info(env, cbInfo, &argc, argv, &thisVar, nullptr) != napi_ok) { LOGE(ATM_DOMAIN, ATM_TAG, "Napi_get_cb_info failed"); return false; } - if (argc < NapiContextCommon::MAX_PARAMS_THREE - 1) { + if (argc < MAX_PARAMS_THREE - 1) { NAPI_CALL_BASE(env, napi_throw(env, GenerateBusinessError(env, JsErrorCode::JS_ERROR_PARAM_ILLEGAL, "Parameter is missing.")), false); return false; @@ -658,7 +658,7 @@ bool NapiRequestPermission::ParseRequestPermissionFromUser(const napi_env& env, return false; } - if (argc == NapiContextCommon::MAX_PARAMS_THREE) { + if (argc == MAX_PARAMS_THREE) { // argv[2] : callback if (!IsUndefinedOrNull(env, argv[2]) && !ParseCallback(env, argv[2], asyncContext->callbackRef)) { errMsg = GetParamErrorMsg("callback", "Callback"); @@ -792,7 +792,7 @@ napi_value NapiRequestPermission::GetPermissionsStatus(napi_env env, napi_callba napi_create_async_work( env, nullptr, resource, GetPermissionsStatusExecute, GetPermissionsStatusComplete, - reinterpret_cast(asyncContext), &(asyncContext->work)); + reinterpret_cast(asyncContext), &(asyncContext->work)); // add async work handle to the napi queue and wait for result napi_queue_async_work_with_qos(env, asyncContext->work, napi_qos_default); @@ -804,14 +804,14 @@ napi_value NapiRequestPermission::GetPermissionsStatus(napi_env env, napi_callba bool NapiRequestPermission::ParseInputToGetQueryResult(const napi_env& env, const napi_callback_info& info, RequestAsyncContext& asyncContext) { - size_t argc = NapiContextCommon::MAX_PARAMS_TWO; - napi_value argv[NapiContextCommon::MAX_PARAMS_TWO] = {nullptr}; + size_t argc = MAX_PARAMS_TWO; + napi_value argv[MAX_PARAMS_TWO] = { nullptr }; napi_value thatVar = nullptr; - void *data = nullptr; + void* data = nullptr; NAPI_CALL_BASE(env, napi_get_cb_info(env, info, &argc, argv, &thatVar, &data), false); // 1: can request permissions minnum argc - if (argc < NapiContextCommon::MAX_PARAMS_TWO - 1) { + if (argc < MAX_PARAMS_TWO - 1) { NAPI_CALL_BASE(env, napi_throw(env, GenerateBusinessError(env, JsErrorCode::JS_ERROR_PARAM_ILLEGAL, "Parameter is missing.")), false); return false; @@ -839,7 +839,7 @@ bool NapiRequestPermission::ParseInputToGetQueryResult(const napi_env& env, cons return true; } -void NapiRequestPermission::GetPermissionsStatusExecute(napi_env env, void *data) +void NapiRequestPermission::GetPermissionsStatusExecute(napi_env env, void* data) { RequestAsyncContext* asyncContext = reinterpret_cast(data); if (asyncContext == nullptr) { @@ -865,7 +865,7 @@ void NapiRequestPermission::GetPermissionsStatusExecute(napi_env env, void *data } } -void NapiRequestPermission::GetPermissionsStatusComplete(napi_env env, napi_status status, void *data) +void NapiRequestPermission::GetPermissionsStatusComplete(napi_env env, napi_status status, void* data) { RequestAsyncContext* asyncContext = reinterpret_cast(data); if (asyncContext == nullptr) { diff --git a/frameworks/js/napi/accesstoken/src/napi_request_permission_on_setting.cpp b/frameworks/js/napi/accesstoken/src/napi_request_permission_on_setting.cpp index e14d167db2625f0e4a2664ae2c721d81935d7bbe..1799deddd483010a23aedec7bcafe8865cbc96f3 100644 --- a/frameworks/js/napi/accesstoken/src/napi_request_permission_on_setting.cpp +++ b/frameworks/js/napi/accesstoken/src/napi_request_permission_on_setting.cpp @@ -565,7 +565,7 @@ napi_value NapiRequestPermissionOnSetting::RequestPermissionOnSetting(napi_env e NAPI_CALL(env, napi_create_string_utf8(env, "RequestPermissionOnSetting", NAPI_AUTO_LENGTH, &resource)); NAPI_CALL(env, napi_create_async_work( env, nullptr, resource, RequestPermissionOnSettingExecute, RequestPermissionOnSettingComplete, - reinterpret_cast(asyncContextHandle.get()), &(asyncContextHandle->asyncContextPtr->work))); + reinterpret_cast(asyncContextHandle.get()), &(asyncContextHandle->asyncContextPtr->work))); NAPI_CALL(env, napi_queue_async_work_with_qos(env, asyncContextHandle->asyncContextPtr->work, napi_qos_user_initiated)); @@ -578,15 +578,15 @@ napi_value NapiRequestPermissionOnSetting::RequestPermissionOnSetting(napi_env e bool NapiRequestPermissionOnSetting::ParseRequestPermissionOnSetting(const napi_env& env, const napi_callback_info& cbInfo, std::shared_ptr& asyncContext) { - size_t argc = NapiContextCommon::MAX_PARAMS_TWO; - napi_value argv[NapiContextCommon::MAX_PARAMS_TWO] = { nullptr }; + size_t argc = MAX_PARAMS_TWO; + napi_value argv[MAX_PARAMS_TWO] = { nullptr }; napi_value thisVar = nullptr; if (napi_get_cb_info(env, cbInfo, &argc, argv, &thisVar, nullptr) != napi_ok) { LOGE(ATM_DOMAIN, ATM_TAG, "Napi_get_cb_info failed"); return false; } - if (argc < NapiContextCommon::MAX_PARAMS_TWO - 1) { + if (argc < MAX_PARAMS_TWO) { NAPI_CALL_BASE(env, napi_throw(env, GenerateBusinessError(env, JsErrorCode::JS_ERROR_PARAM_ILLEGAL, "Parameter is missing.")), false); return false; @@ -676,7 +676,7 @@ void NapiRequestPermissionOnSetting::RequestPermissionOnSettingComplete(napi_env } // return error if (asyncContextHandle->asyncContextPtr->deferred != nullptr) { - int32_t jsCode = NapiContextCommon::GetJsErrorCode(asyncContextHandle->asyncContextPtr->result.errorCode); + int32_t jsCode = GetJsErrorCode(asyncContextHandle->asyncContextPtr->result.errorCode); napi_value businessError = GenerateBusinessError(env, jsCode, GetErrorMessage(jsCode)); NAPI_CALL_RETURN_VOID(env, napi_reject_deferred(env, asyncContextHandle->asyncContextPtr->deferred, businessError)); diff --git a/frameworks/js/napi/el5filekeymanager/src/el5_filekey_manager_napi.cpp b/frameworks/js/napi/el5filekeymanager/src/el5_filekey_manager_napi.cpp index 2244a77180d82b831c46b37c134bc0019b9f69f6..21956cf81a4f8b04a5ea93c45409835ca8f5b973 100644 --- a/frameworks/js/napi/el5filekeymanager/src/el5_filekey_manager_napi.cpp +++ b/frameworks/js/napi/el5filekeymanager/src/el5_filekey_manager_napi.cpp @@ -92,7 +92,7 @@ bool CheckDataType(napi_env env, int32_t dataLockType) napi_value AcquireAccess(napi_env env, napi_callback_info info) { size_t argc = MAX_PARAM_SIZE; - napi_value argv[MAX_PARAM_SIZE] = {nullptr}; + napi_value argv[MAX_PARAM_SIZE] = { nullptr }; if (napi_get_cb_info(env, info, &argc, argv, NULL, NULL) != napi_ok) { LOG_ERROR("napi_get_cb_info failed."); ThrowError(env, EFM_ERR_INVALID_PARAMETER); @@ -123,7 +123,7 @@ napi_value AcquireAccess(napi_env env, napi_callback_info info) napi_value ReleaseAccess(napi_env env, napi_callback_info info) { size_t argc = MAX_PARAM_SIZE; - napi_value argv[MAX_PARAM_SIZE] = {nullptr}; + napi_value argv[MAX_PARAM_SIZE] = { nullptr }; if (napi_get_cb_info(env, info, &argc, argv, NULL, NULL) != napi_ok) { LOG_ERROR("napi_get_cb_info failed."); ThrowError(env, EFM_ERR_INVALID_PARAMETER); @@ -154,7 +154,7 @@ napi_value ReleaseAccess(napi_env env, napi_callback_info info) napi_value QueryAppKeyState(napi_env env, napi_callback_info info) { size_t argc = MAX_PARAM_SIZE; - napi_value argv[MAX_PARAM_SIZE] = {nullptr}; + napi_value argv[MAX_PARAM_SIZE] = { nullptr }; if (napi_get_cb_info(env, info, &argc, argv, NULL, NULL) != napi_ok) { LOG_ERROR("napi_get_cb_info failed."); ThrowError(env, EFM_ERR_INVALID_PARAMETER); @@ -193,7 +193,7 @@ napi_value QueryAppKeyState(napi_env env, napi_callback_info info) return result; } -static void SetNamedProperty(napi_env env, napi_value dstObj, const int32_t objValue, const char *propName) +static void SetNamedProperty(napi_env env, napi_value dstObj, const int32_t objValue, const char* propName) { napi_value prop = nullptr; napi_create_int32(env, objValue, &prop); @@ -256,7 +256,7 @@ static napi_module g_module = { .nm_filename = nullptr, .nm_register_func = Init, .nm_modname = "ability.screenLockFileManager", - .nm_priv = static_cast(nullptr), + .nm_priv = static_cast(nullptr), .reserved = {nullptr} }; diff --git a/frameworks/js/napi/privacy/src/native_module.cpp b/frameworks/js/napi/privacy/src/native_module.cpp index 59b11aafb682eaba50c63d38975667e57be8397b..b399030d9a32d9ffbca72cb1288115ba03374f7e 100644 --- a/frameworks/js/napi/privacy/src/native_module.cpp +++ b/frameworks/js/napi/privacy/src/native_module.cpp @@ -106,7 +106,7 @@ static napi_module g_module = { .nm_filename = nullptr, .nm_register_func = Init, .nm_modname = "privacyManager", - .nm_priv = ((void *)0), + .nm_priv = ((void*)0), .reserved = {0} }; diff --git a/frameworks/js/napi/privacy/src/permission_record_manager_napi.cpp b/frameworks/js/napi/privacy/src/permission_record_manager_napi.cpp index d74fff19f2d71aa34761b4efa33ccbd1cae5cced..5af6a8c259085f15e07df64d95364fc41e5742b3 100644 --- a/frameworks/js/napi/privacy/src/permission_record_manager_napi.cpp +++ b/frameworks/js/napi/privacy/src/permission_record_manager_napi.cpp @@ -581,7 +581,7 @@ napi_value AddPermissionUsedRecord(napi_env env, napi_callback_info cbinfo) { LOGD(PRI_DOMAIN, PRI_TAG, "AddPermissionUsedRecord begin."); - auto *asyncContext = new (std::nothrow) RecordManagerAsyncContext(env); + auto* asyncContext = new (std::nothrow) RecordManagerAsyncContext(env); if (asyncContext == nullptr) { LOGE(PRI_DOMAIN, PRI_TAG, "New struct fail."); return nullptr; @@ -607,7 +607,7 @@ napi_value AddPermissionUsedRecord(napi_env env, napi_callback_info cbinfo) resource, AddPermissionUsedRecordExecute, AddPermissionUsedRecordComplete, - reinterpret_cast(asyncContext), + reinterpret_cast(asyncContext), &(asyncContext->asyncWork))); NAPI_CALL(env, napi_queue_async_work_with_qos(env, asyncContext->asyncWork, napi_qos_default)); callbackPtr.release(); @@ -646,7 +646,7 @@ napi_value SetPermissionUsedRecordToggleStatus(napi_env env, napi_callback_info { LOGD(PRI_DOMAIN, PRI_TAG, "SetPermissionUsedRecordToggleStatus begin."); - auto *asyncContext = new (std::nothrow) RecordManagerAsyncContext(env); + auto* asyncContext = new (std::nothrow) RecordManagerAsyncContext(env); if (asyncContext == nullptr) { LOGE(PRI_DOMAIN, PRI_TAG, "New struct fail."); return nullptr; @@ -672,7 +672,7 @@ napi_value SetPermissionUsedRecordToggleStatus(napi_env env, napi_callback_info resource, SetPermissionUsedRecordToggleStatusExecute, SetPermissionUsedRecordToggleStatusComplete, - reinterpret_cast(asyncContext), + reinterpret_cast(asyncContext), &(asyncContext->asyncWork))); NAPI_CALL(env, napi_queue_async_work_with_qos(env, asyncContext->asyncWork, napi_qos_default)); @@ -713,7 +713,7 @@ napi_value GetPermissionUsedRecordToggleStatus(napi_env env, napi_callback_info { LOGD(PRI_DOMAIN, PRI_TAG, "GetPermissionUsedRecordToggleStatus begin."); - auto *asyncContext = new (std::nothrow) RecordManagerAsyncContext(env); + auto* asyncContext = new (std::nothrow) RecordManagerAsyncContext(env); if (asyncContext == nullptr) { LOGE(PRI_DOMAIN, PRI_TAG, "New struct fail."); return nullptr; @@ -736,7 +736,7 @@ napi_value GetPermissionUsedRecordToggleStatus(napi_env env, napi_callback_info resource, GetPermissionUsedRecordToggleStatusExecute, GetPermissionUsedRecordToggleStatusComplete, - reinterpret_cast(asyncContext), + reinterpret_cast(asyncContext), &(asyncContext->asyncWork))); NAPI_CALL(env, napi_queue_async_work_with_qos(env, asyncContext->asyncWork, napi_qos_default)); @@ -777,7 +777,7 @@ static void StartUsingPermissionComplete(napi_env env, napi_status status, void* napi_value StartUsingPermission(napi_env env, napi_callback_info cbinfo) { LOGD(PRI_DOMAIN, PRI_TAG, "StartUsingPermission begin."); - auto *asyncContext = new (std::nothrow) RecordManagerAsyncContext(env); + auto* asyncContext = new (std::nothrow) RecordManagerAsyncContext(env); if (asyncContext == nullptr) { LOGE(PRI_DOMAIN, PRI_TAG, "New struct fail."); return nullptr; @@ -803,7 +803,7 @@ napi_value StartUsingPermission(napi_env env, napi_callback_info cbinfo) resource, StartUsingPermissionExecute, StartUsingPermissionComplete, - reinterpret_cast(asyncContext), + reinterpret_cast(asyncContext), &(asyncContext->asyncWork))); NAPI_CALL(env, napi_queue_async_work_with_qos(env, asyncContext->asyncWork, napi_qos_default)); callbackPtr.release(); @@ -844,7 +844,7 @@ napi_value StopUsingPermission(napi_env env, napi_callback_info cbinfo) { LOGD(PRI_DOMAIN, PRI_TAG, "StopUsingPermission begin."); - auto *asyncContext = new (std::nothrow) RecordManagerAsyncContext(env); + auto* asyncContext = new (std::nothrow) RecordManagerAsyncContext(env); if (asyncContext == nullptr) { LOGE(PRI_DOMAIN, PRI_TAG, "New struct fail."); return nullptr; @@ -870,7 +870,7 @@ napi_value StopUsingPermission(napi_env env, napi_callback_info cbinfo) resource, StopUsingPermissionExecute, StopUsingPermissionComplete, - reinterpret_cast(asyncContext), + reinterpret_cast(asyncContext), &(asyncContext->asyncWork))); NAPI_CALL(env, napi_queue_async_work_with_qos(env, asyncContext->asyncWork, napi_qos_default)); callbackPtr.release(); @@ -911,7 +911,7 @@ static void GetPermissionUsedRecordsComplete(napi_env env, napi_status status, v napi_value GetPermissionUsedRecords(napi_env env, napi_callback_info cbinfo) { LOGD(PRI_DOMAIN, PRI_TAG, "GetPermissionUsedRecords begin."); - auto *asyncContext = new (std::nothrow) RecordManagerAsyncContext(env); + auto* asyncContext = new (std::nothrow) RecordManagerAsyncContext(env); if (asyncContext == nullptr) { LOGE(PRI_DOMAIN, PRI_TAG, "New struct fail."); return nullptr; @@ -937,7 +937,7 @@ napi_value GetPermissionUsedRecords(napi_env env, napi_callback_info cbinfo) resource, GetPermissionUsedRecordsExecute, GetPermissionUsedRecordsComplete, - reinterpret_cast(asyncContext), + reinterpret_cast(asyncContext), &(asyncContext->asyncWork))); NAPI_CALL(env, napi_queue_async_work_with_qos(env, asyncContext->asyncWork, napi_qos_default)); callbackPtr.release(); @@ -948,7 +948,7 @@ static bool ParseInputToRegister(const napi_env env, const napi_callback_info cb RegisterPermActiveChangeContext& registerPermActiveChangeContext) { size_t argc = ON_OFF_MAX_PARAMS; - napi_value argv[ON_OFF_MAX_PARAMS] = {nullptr}; + napi_value argv[ON_OFF_MAX_PARAMS] = { nullptr }; napi_value thisVar = nullptr; napi_ref callback = nullptr; NAPI_CALL_BASE(env, napi_get_cb_info(env, cbInfo, &argc, argv, &thisVar, nullptr), false); @@ -990,7 +990,7 @@ static bool ParseInputToUnregister(const napi_env env, const napi_callback_info UnregisterPermActiveChangeContext& unregisterPermActiveChangeContext) { size_t argc = ON_OFF_MAX_PARAMS; - napi_value argv[ON_OFF_MAX_PARAMS] = {nullptr}; + napi_value argv[ON_OFF_MAX_PARAMS] = { nullptr }; napi_value thisVar = nullptr; napi_ref callback = nullptr; NAPI_CALL_BASE(env, napi_get_cb_info(env, cbInfo, &argc, argv, &thisVar, nullptr), false); @@ -1189,7 +1189,7 @@ static bool ParseGetPermissionUsedType(const napi_env env, const napi_callback_i PermissionUsedTypeAsyncContext& context) { size_t argc = GET_PERMISSION_USED_TYPE_MAX_PARAMS; - napi_value argv[GET_PERMISSION_USED_TYPE_MAX_PARAMS] = {nullptr}; + napi_value argv[GET_PERMISSION_USED_TYPE_MAX_PARAMS] = { nullptr }; napi_value thisVar = nullptr; NAPI_CALL_BASE(env, napi_get_cb_info(env, cbInfo, &argc, argv, &thisVar, nullptr), false); @@ -1297,7 +1297,7 @@ napi_value GetPermissionUsedTypeInfos(napi_env env, napi_callback_info cbinfo) { LOGI(PRI_DOMAIN, PRI_TAG, "GetPermissionUsedTypeInfos begin."); - auto *asyncContext = new (std::nothrow) PermissionUsedTypeAsyncContext(env); + auto* asyncContext = new (std::nothrow) PermissionUsedTypeAsyncContext(env); if (asyncContext == nullptr) { LOGE(PRI_DOMAIN, PRI_TAG, "New struct fail."); return nullptr; @@ -1319,7 +1319,7 @@ napi_value GetPermissionUsedTypeInfos(napi_env env, napi_callback_info cbinfo) resource, GetPermissionUsedTypeInfosExecute, GetPermissionUsedTypeInfosComplete, - reinterpret_cast(asyncContext), + reinterpret_cast(asyncContext), &(asyncContext->asyncWork))); NAPI_CALL(env, napi_queue_async_work_with_qos(env, asyncContext->asyncWork, napi_qos_default)); callbackPtr.release(); diff --git a/frameworks/json_adapter/include/cjson_utils.h b/frameworks/json_adapter/include/cjson_utils.h index 24919c2c9b56931956b2396c27df50bd399d5a25..f3dc30b6305ab3fd69f3db73faa424b76eb7e160 100644 --- a/frameworks/json_adapter/include/cjson_utils.h +++ b/frameworks/json_adapter/include/cjson_utils.h @@ -27,7 +27,7 @@ namespace OHOS { namespace Security { namespace AccessToken { typedef cJSON CJson; -typedef std::unique_ptr> CJsonUnique; +typedef std::unique_ptr> CJsonUnique; /* NO Need to call FreeJson to free the returned pointer when it's no longer in use. */ CJsonUnique CreateJsonFromString(const std::string& jsonStr); @@ -58,7 +58,7 @@ bool GetArrayFromJson(const CJson* jsonObj, const std::string& key, std::vector< /* * Return a copy of string in jsonObj in std::string */ -bool GetStringFromJson(const CJson *jsonObj, const std::string& key, std::string& out); +bool GetStringFromJson(const CJson* jsonObj, const std::string& key, std::string& out); bool GetIntFromJson(const CJson* jsonObj, const std::string& key, int32_t& value); bool GetIntFromJson(const CJsonUnique& jsonObj, const std::string& key, int32_t& value); diff --git a/frameworks/json_adapter/src/cjson_utils.cpp b/frameworks/json_adapter/src/cjson_utils.cpp index 0ceb6a8ecee4fcf76809688f5800ae3d53167344..a07c19ae678f663275885d93941f0841e45462d9 100644 --- a/frameworks/json_adapter/src/cjson_utils.cpp +++ b/frameworks/json_adapter/src/cjson_utils.cpp @@ -203,7 +203,7 @@ bool GetArrayFromJson(const CJson* jsonObj, const std::string& key, std::vector< return false; } -bool GetStringFromJson(const CJson *jsonObj, const std::string& key, std::string& out) +bool GetStringFromJson(const CJson* jsonObj, const std::string& key, std::string& out) { if (jsonObj == nullptr || key.empty()) { return false; @@ -319,9 +319,7 @@ bool AddObjToArray(CJson* jsonArr, CJson* item) if (tmpObj == nullptr) { return false; } - - bool ret = cJSON_AddItemToArray(jsonArr, tmpObj); - return ret; + return cJSON_AddItemToArray(jsonArr, tmpObj); } bool AddObjToArray(CJsonUnique& jsonArr, CJsonUnique& item) diff --git a/frameworks/json_adapter/test/unittest/cjson_utils_test.cpp b/frameworks/json_adapter/test/unittest/cjson_utils_test.cpp index 9044ce4c7093d0382e934e386fbf96854ec18a39..803639f202e18dfe21f499613f89c3215f108bfd 100644 --- a/frameworks/json_adapter/test/unittest/cjson_utils_test.cpp +++ b/frameworks/json_adapter/test/unittest/cjson_utils_test.cpp @@ -416,6 +416,10 @@ HWTEST_F(CJsonUtilsTest, JsonToStringFormattedTest001, TestSize.Level3) { std::string str = JsonToStringFormatted(nullptr); EXPECT_TRUE(str.empty()); + + CJsonUnique jsonInner = CreateJson(); + str = JsonToStringFormatted(jsonInner.get(), 501); // 501: level + EXPECT_TRUE(str.empty()); } /* @@ -426,14 +430,15 @@ HWTEST_F(CJsonUtilsTest, JsonToStringFormattedTest001, TestSize.Level3) */ HWTEST_F(CJsonUtilsTest, JsonToStringFormattedTest002, TestSize.Level3) { + CJsonUnique jsonInner = CreateJson(); + std::string str = JsonToStringFormatted(jsonInner.get()); + EXPECT_FALSE(str.empty()); + CJsonUnique json = CreateJsonFromString(g_testJsonStr); EXPECT_NE(nullptr, json.get()); - std::string str = JsonToStringFormatted(json.get()); + str = JsonToStringFormatted(json.get()); EXPECT_FALSE(str.empty()); - - str = JsonToStringFormatted(json.get(), 501); // 501: level - EXPECT_TRUE(str.empty()); } } // namespace AccessToken } // namespace Security diff --git a/interfaces/innerkits/accesstoken/src/accesstoken_kit.cpp b/interfaces/innerkits/accesstoken/src/accesstoken_kit.cpp index 304b9ffca4ddbce98030a008fec5a63d69a6e33f..cd5b99e0979c4e8eede7573a19bad759cb6f98a4 100644 --- a/interfaces/innerkits/accesstoken/src/accesstoken_kit.cpp +++ b/interfaces/innerkits/accesstoken/src/accesstoken_kit.cpp @@ -72,7 +72,7 @@ int AccessTokenKit::GrantPermissionForSpecifiedTime( static bool IsRenderToken(AccessTokenID tokenID) { - AccessTokenIDInner *idInner = reinterpret_cast(&tokenID); + AccessTokenIDInner* idInner = reinterpret_cast(&tokenID); return idInner->renderFlag; } @@ -204,7 +204,7 @@ ATokenTypeEnum AccessTokenKit::GetTokenTypeFlag(AccessTokenID tokenID) LOGE(ATM_DOMAIN, ATM_TAG, "TokenID is invalid"); return TOKEN_INVALID; } - AccessTokenIDInner *idInner = reinterpret_cast(&tokenID); + AccessTokenIDInner* idInner = reinterpret_cast(&tokenID); return static_cast(idInner->type); } @@ -227,7 +227,7 @@ ATokenTypeEnum AccessTokenKit::GetTokenTypeFlag(FullTokenID tokenID) LOGE(ATM_DOMAIN, ATM_TAG, "TokenID is invalid"); return TOKEN_INVALID; } - AccessTokenIDInner *idInner = reinterpret_cast(&id); + AccessTokenIDInner* idInner = reinterpret_cast(&id); return static_cast(idInner->type); } @@ -625,7 +625,7 @@ int32_t AccessTokenKit::GetHapDlpFlag(AccessTokenID tokenID) LOGE(ATM_DOMAIN, ATM_TAG, "TokenID is invalid"); return INVALID_DLP_TOKEN_FLAG; } - AccessTokenIDInner *idInner = reinterpret_cast(&tokenID); + AccessTokenIDInner* idInner = reinterpret_cast(&tokenID); return static_cast(idInner->dlpFlag); } @@ -769,10 +769,10 @@ uint64_t AccessTokenKit::GetRenderTokenID(uint64_t tokenId) LOGE(ATM_DOMAIN, ATM_TAG, "TokenID is invalid"); return tokenId; } - AccessTokenIDInner *idInner = reinterpret_cast(&id); + AccessTokenIDInner* idInner = reinterpret_cast(&id); idInner->renderFlag = 1; - id = *reinterpret_cast(idInner); + id = *reinterpret_cast(idInner); return static_cast(id); } diff --git a/interfaces/innerkits/accesstoken/src/accesstoken_manager_client.cpp b/interfaces/innerkits/accesstoken/src/accesstoken_manager_client.cpp index b78a9ec69c5e27157994feef60aece30dd12add2..3aa5f2d49f4985842fede515bf4dc4697b925eba 100644 --- a/interfaces/innerkits/accesstoken/src/accesstoken_manager_client.cpp +++ b/interfaces/innerkits/accesstoken/src/accesstoken_manager_client.cpp @@ -121,7 +121,7 @@ int AccessTokenManagerClient::VerifyAccessToken(AccessTokenID tokenID, const std LOGE(ATM_DOMAIN, ATM_TAG, "At service has been started, ret=%{public}d.", ret); return PERMISSION_DENIED; } - AccessTokenIDInner *idInner = reinterpret_cast(&tokenID); + AccessTokenIDInner* idInner = reinterpret_cast(&tokenID); if (static_cast(idInner->type) == TOKEN_NATIVE) { LOGI(ATM_DOMAIN, ATM_TAG, "At service has not been started."); return PERMISSION_GRANTED; diff --git a/interfaces/innerkits/accesstoken/src/tokenid_kit.cpp b/interfaces/innerkits/accesstoken/src/tokenid_kit.cpp index 5c2864384454a768a15be4ea25bb693ad7b71ae4..df57f3921db17552d0c9fea0105ea3d720af1ace 100644 --- a/interfaces/innerkits/accesstoken/src/tokenid_kit.cpp +++ b/interfaces/innerkits/accesstoken/src/tokenid_kit.cpp @@ -41,10 +41,10 @@ uint64_t TokenIdKit::GetRenderTokenID(uint64_t tokenId) LOGE(ATM_DOMAIN, ATM_TAG, "TokenID is invalid"); return tokenId; } - AccessTokenIDInner *idInner = reinterpret_cast(&id); + AccessTokenIDInner* idInner = reinterpret_cast(&id); idInner->renderFlag = 1; - id = *reinterpret_cast(idInner); + id = *reinterpret_cast(idInner); return static_cast(id); } } // namespace AccessToken diff --git a/interfaces/innerkits/nativetoken/test/unittest/src/nativetoken_oper_test.cpp b/interfaces/innerkits/nativetoken/test/unittest/src/nativetoken_oper_test.cpp index 34821f6933962af4597302bb6f8d6a3c83a8c4fe..3f60b42354402bb90cc70f54f343fe9e5d0a037e 100644 --- a/interfaces/innerkits/nativetoken/test/unittest/src/nativetoken_oper_test.cpp +++ b/interfaces/innerkits/nativetoken/test/unittest/src/nativetoken_oper_test.cpp @@ -222,28 +222,29 @@ HWTEST_F(TokenOperTest, UpdateGoalItemFromRecord001, TestSize.Level0) const char *stringJson2 = "[{\"processName_\":\"partitionslot_host\"," "\"APL\":2,\"version\":1,\"tokenId\":672003577,\"tokenAttr\":0,\"dcaps\":[]," "\"permissions\":[],\"nativeAcls\":[]}]"; - cJSON* jsonroot = cJSON_Parse(stringJson2); - EXPECT_NE(UpdateGoalItemFromRecord(&tokenNode, jsonroot), 0); - cJSON_Delete(jsonroot); + cJSON* jsonRoot = cJSON_Parse(stringJson2); + EXPECT_NE(UpdateGoalItemFromRecord(&tokenNode, jsonRoot), 0); + cJSON_Delete(jsonRoot); std::string stringJson1 = R"()"\ R"({"processName":"process5","APL":3,"version":1,"tokenId":678065606,"tokenAttr":0,)"\ R"("dcaps":["AT_CAP","ST_CAP"], "permissions":[], "nativeAcls":[]})"; - cJSON* jsonRoot = cJSON_Parse(stringJson1.c_str()); + jsonRoot = cJSON_Parse(stringJson1.c_str()); EXPECT_NE(UpdateGoalItemFromRecord(&tokenNode, jsonRoot), 0); + cJSON_Delete(jsonRoot); // processName json is not string const char *stringJson3 = "[{\"processName\": 1," "\"APL\":1,\"version\":1,\"tokenId\":672003577,\"tokenAttr\":0,\"dcaps\":[]," "\"permissions\":[],\"nativeAcls\":[]}]"; - jsonroot = cJSON_Parse(stringJson3); - EXPECT_NE(UpdateGoalItemFromRecord(&tokenNode, jsonroot), 0); - cJSON_Delete(jsonroot); + jsonRoot = cJSON_Parse(stringJson3); + EXPECT_NE(UpdateGoalItemFromRecord(&tokenNode, jsonRoot), 0); + cJSON_Delete(jsonRoot); const char *stringJson4 = "[]"; - jsonroot = cJSON_Parse(stringJson4); - EXPECT_NE(UpdateGoalItemFromRecord(&tokenNode, jsonroot), 0); - cJSON_Delete(jsonroot); + jsonRoot = cJSON_Parse(stringJson4); + EXPECT_NE(UpdateGoalItemFromRecord(&tokenNode, jsonRoot), 0); + cJSON_Delete(jsonRoot); } diff --git a/interfaces/kits/js/napi/accesstoken/include/napi_context_common.h b/interfaces/kits/js/napi/accesstoken/include/napi_context_common.h index 4992ac9ef046a11e26c91b331447fd2b4249c39b..9d92a351fdd7fa7a16dabaa9ec32b642d385158d 100644 --- a/interfaces/kits/js/napi/accesstoken/include/napi_context_common.h +++ b/interfaces/kits/js/napi/accesstoken/include/napi_context_common.h @@ -23,18 +23,15 @@ namespace OHOS { namespace Security { namespace AccessToken { -class NapiContextCommon { -public: - static constexpr int32_t MAX_PARAMS_ONE = 1; - static constexpr int32_t MAX_PARAMS_TWO = 2; - static constexpr int32_t MAX_PARAMS_THREE = 3; - static constexpr int32_t MAX_PARAMS_FOUR = 4; - static constexpr int32_t MAX_LENGTH = 256; - static constexpr int32_t MAX_WAIT_TIME = 1000; - static constexpr int32_t VALUE_MAX_LEN = 32; +#define MAX_PARAMS_ONE 1 +#define MAX_PARAMS_TWO 2 +#define MAX_PARAMS_THREE 3 +#define MAX_PARAMS_FOUR 4 +#define MAX_LENGTH 256 +#define MAX_WAIT_TIME 1000 +#define VALUE_MAX_LEN 32 - static int32_t GetJsErrorCode(int32_t errCode); -}; +int32_t GetJsErrorCode(int32_t errCode); struct AtManagerAsyncWorkData { explicit AtManagerAsyncWorkData(napi_env envValue); virtual ~AtManagerAsyncWorkData(); diff --git a/services/common/json_parse/include/json_parse_loader.h b/services/common/json_parse/include/json_parse_loader.h index 87a7697ebf38478cffeed1c7b532bc2fc1121f45..78d96257b3e0b505dacd4a98456e4b55ffdc36c8 100644 --- a/services/common/json_parse/include/json_parse_loader.h +++ b/services/common/json_parse/include/json_parse_loader.h @@ -75,7 +75,7 @@ public: virtual int32_t GetDlpPermissions(std::vector& dlpPerms); virtual std::string DumpNativeTokenInfo(const NativeTokenInfoBase& native); virtual std::string DumpHapTokenInfo(const HapTokenInfo& hapInfo, bool isRemote, bool isPermDialogForbidden, - std::vector permStateList); + const std::vector& permStateList); }; class ConfigPolicLoader final: public ConfigPolicyLoaderInterface { @@ -84,7 +84,7 @@ class ConfigPolicLoader final: public ConfigPolicyLoaderInterface { int32_t GetDlpPermissions(std::vector& dlpPerms); std::string DumpNativeTokenInfo(const NativeTokenInfoBase& native); std::string DumpHapTokenInfo(const HapTokenInfo& hapInfo, bool isRemote, bool isPermDialogForbidden, - std::vector permStateList); + const std::vector& permStateList); private: #ifdef CUSTOMIZATION_CONFIG_POLICY_ENABLE void GetConfigFilePathList(std::vector& pathList); diff --git a/services/common/json_parse/src/json_parse_loader.cpp b/services/common/json_parse/src/json_parse_loader.cpp index 24d608c26256c977b85ef9b4ca04f9cc1dad6f16..0c4bd78bc54b52a389cce33502f4123b80db4ec5 100644 --- a/services/common/json_parse/src/json_parse_loader.cpp +++ b/services/common/json_parse/src/json_parse_loader.cpp @@ -142,7 +142,7 @@ bool ConfigPolicLoader::IsDirExsit(const std::string& file) #ifdef CUSTOMIZATION_CONFIG_POLICY_ENABLE void ConfigPolicLoader::GetConfigFilePathList(std::vector& pathList) { - CfgDir *dirs = GetCfgDirList(); // malloc a CfgDir point, need to free later + CfgDir* dirs = GetCfgDirList(); // malloc a CfgDir point, need to free later if (dirs == nullptr) { LOGE(ATM_DOMAIN, ATM_TAG, "Can't get cfg file path."); return; @@ -228,13 +228,13 @@ bool ConfigPolicLoader::GetConfigValueFromFile(const ServiceType& type, const st } if (type == ServiceType::ACCESSTOKEN_SERVICE) { - CJson *atJson = GetObjFromJson(jsonRes, "accesstoken"); + CJson* atJson = GetObjFromJson(jsonRes, "accesstoken"); return GetAtCfgFromJson(atJson, config.atConfig); } else if (type == ServiceType::PRIVACY_SERVICE) { - CJson *prJson = GetObjFromJson(jsonRes, "privacy"); + CJson* prJson = GetObjFromJson(jsonRes, "privacy"); return GetPrivacyCfgFromJson(prJson, config.pConfig); } - CJson *toSyncJson = GetObjFromJson(jsonRes, "tokensync"); + CJson* toSyncJson = GetObjFromJson(jsonRes, "tokensync"); return GetTokenSyncCfgFromJson(toSyncJson, config.tsConfig); } #endif // CUSTOMIZATION_CONFIG_POLICY_ENABLE @@ -266,7 +266,7 @@ bool ConfigPolicLoader::GetConfigValue(const ServiceType& type, AccessTokenConfi static int32_t NativeReqPermsGet(const CJson* j, std::vector& permStateList) { - CJson *permJson = GetArrayFromJson(j, JSON_PERMS); + CJson* permJson = GetArrayFromJson(j, JSON_PERMS); if (permJson == nullptr) { LOGE(ATM_DOMAIN, ATM_TAG, "JSON_PERMS is invalid."); return ERR_PARAM_INVALID; @@ -294,7 +294,7 @@ static int32_t NativeReqPermsGet(const CJson* j, std::vector& static ATokenTypeEnum GetTokenIdTypeEnum(AccessTokenID id) { - AccessTokenIDInner *idInner = reinterpret_cast(&id); + AccessTokenIDInner* idInner = reinterpret_cast(&id); return static_cast(idInner->type); } @@ -320,8 +320,8 @@ static void GetSingleNativeTokenFromJson(const CJson* j, NativeTokenInfoBase& n if (!GetUnsignedIntFromJson(j, JSON_TOKEN_ATTR, info.tokenAttr)) { return; } - CJson *dcapsJson = GetArrayFromJson(j, JSON_DCAPS); - CJson *aclsJson = GetArrayFromJson(j, JSON_ACLS); + CJson* dcapsJson = GetArrayFromJson(j, JSON_DCAPS); + CJson* aclsJson = GetArrayFromJson(j, JSON_ACLS); if ((dcapsJson == nullptr) || (aclsJson == nullptr)) { return; } @@ -361,7 +361,7 @@ bool ConfigPolicLoader::ParserNativeRawData( } int32_t len = cJSON_GetArraySize(jsonRes.get()); for (int32_t i = 0; i < len; i++) { - cJSON *item = cJSON_GetArrayItem(jsonRes.get(), i); + CJson* item = cJSON_GetArrayItem(jsonRes.get(), i); NativeTokenInfoBase token; GetSingleNativeTokenFromJson(item, token); if (!token.processName.empty()) { @@ -387,7 +387,7 @@ int32_t ConfigPolicLoader::GetAllNativeTokenInfo(std::vector dlpPermissions; cJSON_ArrayForEach(j, dlpPermTokenJson) { PermissionDlpMode p; @@ -450,8 +450,8 @@ int32_t ConfigPolicLoader::GetDlpPermissions(std::vector& dlp return RET_SUCCESS; } -std::string ConfigPolicLoader::DumpHapTokenInfo( - const HapTokenInfo& hapInfo, bool isRemote, bool isPermDialogForbidden, std::vector permStateList) +std::string ConfigPolicLoader::DumpHapTokenInfo(const HapTokenInfo& hapInfo, bool isRemote, bool isPermDialogForbidden, + const std::vector& permStateList) { CJsonUnique j = CreateJson(); (void)AddUnsignedIntToJson(j, "tokenID", hapInfo.tokenID); diff --git a/services/el5filekeymanager/include/el5_filekey_manager_service.h b/services/el5filekeymanager/include/el5_filekey_manager_service.h index 0738b4684d0dfa378ff26bee22cbca9da02a063d..365984246293dffaecb09146558944c9125de1dd 100644 --- a/services/el5filekeymanager/include/el5_filekey_manager_service.h +++ b/services/el5filekeymanager/include/el5_filekey_manager_service.h @@ -78,7 +78,7 @@ private: #ifdef EVENTHANDLER_ENABLE std::shared_ptr unloadHandler_; #endif - void *handler_{nullptr}; + void *handler_{ nullptr }; DISALLOW_COPY_AND_MOVE(El5FilekeyManagerService); }; diff --git a/services/tokensyncmanager/include/remote/soft_bus_socket_listener.h b/services/tokensyncmanager/include/remote/soft_bus_socket_listener.h index 180f95d0513524944223316bb90a01c669037a56..6beea0a573582dd8fbddeaab9a0e5c2e55079b13 100644 --- a/services/tokensyncmanager/include/remote/soft_bus_socket_listener.h +++ b/services/tokensyncmanager/include/remote/soft_bus_socket_listener.h @@ -29,10 +29,10 @@ class SoftBusSocketListener final { public: static void OnBind(int32_t socket, PeerSocketInfo info); static void OnShutdown(int32_t socket, ShutdownReason reason); - static void OnClientBytes(int32_t socket, const void *data, uint32_t dataLen); - static void OnServiceBytes(int32_t socket, const void *data, uint32_t dataLen); + static void OnClientBytes(int32_t socket, const void* data, uint32_t dataLen); + static void OnServiceBytes(int32_t socket, const void* data, uint32_t dataLen); // this callback softbus not ready - static void OnQos(int32_t socket, QoSEvent eventId, const QosTV *qos, uint32_t qosCount) {}; + static void OnQos(int32_t socket, QoSEvent eventId, const QosTV* qos, uint32_t qosCount) {}; static void CleanUpAllBindSocket(); private: diff --git a/services/tokensyncmanager/src/command/base_remote_command.cpp b/services/tokensyncmanager/src/command/base_remote_command.cpp index d932b4cd75f94ec6f362c1b3a34070560c11c199..36f060a23e299755615e3c0543677dd85c3763ca 100644 --- a/services/tokensyncmanager/src/command/base_remote_command.cpp +++ b/services/tokensyncmanager/src/command/base_remote_command.cpp @@ -83,17 +83,13 @@ CJsonUnique BaseRemoteCommand::ToNativeTokenInfoJson(const NativeTokenInfoBase& } CJsonUnique dcapsJson = CreateJsonArray(); for (const auto& item : tokenInfo.dcap) { - cJSON *tmpObj = cJSON_CreateString(item.c_str()); - AddObjToArray(dcapsJson.get(), tmpObj); - cJSON_Delete(tmpObj); - tmpObj = nullptr; + CJsonUnique dcapJson = CreateJsonString(item.c_str()); + AddObjToArray(dcapsJson.get(), dcapJson.get()); } CJsonUnique nativeAclsJson = CreateJsonArray(); for (const auto& item : tokenInfo.nativeAcls) { - cJSON *tmpObj = cJSON_CreateString(item.c_str()); - AddObjToArray(nativeAclsJson.get(), tmpObj); - cJSON_Delete(tmpObj); - tmpObj = nullptr; + CJsonUnique nativeAclJson = CreateJsonString(item.c_str()); + AddObjToArray(nativeAclsJson.get(), nativeAclJson.get()); } CJsonUnique nativeTokenJson = CreateJson(); AddStringToJson(nativeTokenJson, "processName", tokenInfo.processName); @@ -107,7 +103,7 @@ CJsonUnique BaseRemoteCommand::ToNativeTokenInfoJson(const NativeTokenInfoBase& return nativeTokenJson; } -void BaseRemoteCommand::ToPermStateJson(cJSON* permStateJson, const PermissionStatus& state) +void BaseRemoteCommand::ToPermStateJson(CJson* permStateJson, const PermissionStatus& state) { AddStringToJson(permStateJson, "permissionName", state.permissionName); AddIntToJson(permStateJson, "grantStatus", state.grantStatus); @@ -134,7 +130,7 @@ CJsonUnique BaseRemoteCommand::ToHapTokenInfosJson(const HapTokenInfoForSync& to return hapTokensJson; } -void BaseRemoteCommand::FromHapTokenBasicInfoJson(const cJSON* hapTokenJson, +void BaseRemoteCommand::FromHapTokenBasicInfoJson(const CJson* hapTokenJson, HapTokenInfo& hapTokenBasicInfo) { int32_t ver; @@ -148,14 +144,14 @@ void BaseRemoteCommand::FromHapTokenBasicInfoJson(const cJSON* hapTokenJson, GetIntFromJson(hapTokenJson, JSON_DLP_TYPE, hapTokenBasicInfo.dlpType); } -void BaseRemoteCommand::FromPermStateListJson(const cJSON* hapTokenJson, +void BaseRemoteCommand::FromPermStateListJson(const CJson* hapTokenJson, std::vector& permStateList) { - cJSON *jsonObjTmp = GetArrayFromJson(hapTokenJson, "permState"); + CJson* jsonObjTmp = GetArrayFromJson(hapTokenJson, "permState"); if (jsonObjTmp != nullptr) { int len = cJSON_GetArraySize(jsonObjTmp); for (int i = 0; i < len; i++) { - cJSON *permissionJson = cJSON_GetArrayItem(jsonObjTmp, i); + CJson* permissionJson = cJSON_GetArrayItem(jsonObjTmp, i); PermissionStatus permission; if (!GetStringFromJson(permissionJson, "permissionName", permission.permissionName)) { continue; @@ -171,7 +167,7 @@ void BaseRemoteCommand::FromPermStateListJson(const cJSON* hapTokenJson, } } -void BaseRemoteCommand::FromHapTokenInfoJson(const cJSON* hapTokenJson, +void BaseRemoteCommand::FromHapTokenInfoJson(const CJson* hapTokenJson, HapTokenInfoForSync& hapTokenInfo) { FromHapTokenBasicInfoJson(hapTokenJson, hapTokenInfo.baseInfo); @@ -182,7 +178,7 @@ void BaseRemoteCommand::FromHapTokenInfoJson(const cJSON* hapTokenJson, FromPermStateListJson(hapTokenJson, hapTokenInfo.permStateList); } -void BaseRemoteCommand::FromNativeTokenInfoJson(const cJSON* nativeTokenJson, +void BaseRemoteCommand::FromNativeTokenInfoJson(const CJson* nativeTokenJson, NativeTokenInfoBase& nativeTokenInfo) { GetStringFromJson(nativeTokenJson, "processName", nativeTokenInfo.processName); @@ -197,9 +193,9 @@ void BaseRemoteCommand::FromNativeTokenInfoJson(const cJSON* nativeTokenJson, GetUnsignedIntFromJson(nativeTokenJson, "tokenId", nativeTokenInfo.tokenID); GetUnsignedIntFromJson(nativeTokenJson, "tokenAttr", nativeTokenInfo.tokenAttr); - cJSON *dcapsJson = GetArrayFromJson(nativeTokenJson, "dcaps"); + CJson* dcapsJson = GetArrayFromJson(nativeTokenJson, "dcaps"); if (dcapsJson != nullptr) { - CJson *dcap = nullptr; + CJson* dcap = nullptr; std::vector dcaps; cJSON_ArrayForEach(dcap, dcapsJson) { std::string item = cJSON_GetStringValue(dcap); @@ -207,9 +203,9 @@ void BaseRemoteCommand::FromNativeTokenInfoJson(const cJSON* nativeTokenJson, } nativeTokenInfo.dcap = dcaps; } - cJSON *nativeAclsJson = GetArrayFromJson(nativeTokenJson, "nativeAcls"); + CJson* nativeAclsJson = GetArrayFromJson(nativeTokenJson, "nativeAcls"); if (nativeAclsJson != nullptr) { - CJson *acl = nullptr; + CJson* acl = nullptr; std::vector nativeAcls; cJSON_ArrayForEach(acl, nativeAclsJson) { std::string item = cJSON_GetStringValue(acl); diff --git a/services/tokensyncmanager/src/command/update_remote_hap_token_command.cpp b/services/tokensyncmanager/src/command/update_remote_hap_token_command.cpp index 4be1b0b7618087a29c895fa3919e9326e3a7f267..b4102b0234b8dafce577fc5501f4ef76648bacbd 100644 --- a/services/tokensyncmanager/src/command/update_remote_hap_token_command.cpp +++ b/services/tokensyncmanager/src/command/update_remote_hap_token_command.cpp @@ -47,7 +47,7 @@ UpdateRemoteHapTokenCommand::UpdateRemoteHapTokenCommand(const std::string &json } BaseRemoteCommand::FromRemoteProtocolJson(jsonObject.get()); - CJson *hapTokenJson = GetObjFromJson(jsonObject, "HapTokenInfos"); + CJson* hapTokenJson = GetObjFromJson(jsonObject, "HapTokenInfos"); if (hapTokenJson != nullptr) { BaseRemoteCommand::FromHapTokenInfoJson(hapTokenJson, updateTokenInfo_); } diff --git a/services/tokensyncmanager/src/remote/soft_bus_channel.cpp b/services/tokensyncmanager/src/remote/soft_bus_channel.cpp index b1e0cda89df9a95fa455615f7651caeb5e82e6a9..386b374fd8f121f042f717cd36092d1e398808aa 100644 --- a/services/tokensyncmanager/src/remote/soft_bus_channel.cpp +++ b/services/tokensyncmanager/src/remote/soft_bus_channel.cpp @@ -184,7 +184,7 @@ std::string SoftBusChannel::ExecuteCommand(const std::string &commandName, const std::string uuid = GetUuid(); int len = static_cast(RPC_TRANSFER_HEAD_BYTES_LENGTH + jsonPayload.length()); - unsigned char *buf = new (std::nothrow) unsigned char[len + 1]; + unsigned char* buf = new (std::nothrow) unsigned char[len + 1]; if (buf == nullptr) { LOGE(ATM_DOMAIN, ATM_TAG, "No enough memory: %{public}d", len); return ""; @@ -222,7 +222,7 @@ std::string SoftBusChannel::ExecuteCommand(const std::string &commandName, const return responseResult_; } -void SoftBusChannel::HandleDataReceived(int socket, const unsigned char *bytes, int length) +void SoftBusChannel::HandleDataReceived(int socket, const unsigned char* bytes, int length) { LOGD(ATM_DOMAIN, ATM_TAG, "HandleDataReceived"); #ifdef DEBUG_API_PERFORMANCE @@ -281,7 +281,7 @@ int SoftBusChannel::PrepareBytes(const std::string &type, const std::string &id, return Compress(json, info.bytes, info.bytesLength); } -int SoftBusChannel::Compress(const std::string &json, const unsigned char *compressedBytes, int &compressedLength) +int SoftBusChannel::Compress(const std::string &json, const unsigned char* compressedBytes, int &compressedLength) { uLong len = compressBound(json.size()); // length will not so that long @@ -292,8 +292,8 @@ int SoftBusChannel::Compress(const std::string &json, const unsigned char *compr return Constant::FAILURE; } - int result = compress(const_cast(compressedBytes), &len, - reinterpret_cast(const_cast(json.c_str())), json.size() + 1); + int result = compress(const_cast(compressedBytes), &len, + reinterpret_cast(const_cast(json.c_str())), json.size() + 1); if (result != Z_OK) { LOGE(ATM_DOMAIN, ATM_TAG, "Compress failed! error code: %{public}d", result); return result; @@ -304,17 +304,17 @@ int SoftBusChannel::Compress(const std::string &json, const unsigned char *compr return Constant::SUCCESS; } -std::string SoftBusChannel::Decompress(const unsigned char *bytes, const int length) +std::string SoftBusChannel::Decompress(const unsigned char* bytes, const int length) { LOGD(ATM_DOMAIN, ATM_TAG, "Input length: %{public}d", length); uLong len = RPC_TRANSFER_BYTES_MAX_LENGTH; - unsigned char *buf = new (std::nothrow) unsigned char[len + 1]; + unsigned char* buf = new (std::nothrow) unsigned char[len + 1]; if (buf == nullptr) { LOGE(ATM_DOMAIN, ATM_TAG, "No enough memory!"); return ""; } (void)memset_s(buf, len + 1, 0, len + 1); - int result = uncompress(buf, &len, const_cast(bytes), length); + int result = uncompress(buf, &len, const_cast(bytes), length); if (result != Z_OK) { LOGE(ATM_DOMAIN, ATM_TAG, "uncompress failed, error code: %{public}d, bound length: %{public}d, buffer length: %{public}d", result, @@ -323,12 +323,12 @@ std::string SoftBusChannel::Decompress(const unsigned char *bytes, const int len return ""; } buf[len] = '\0'; - std::string str(reinterpret_cast(buf)); + std::string str(reinterpret_cast(buf)); delete[] buf; return str; } -int SoftBusChannel::SendRequestBytes(const unsigned char *bytes, const int bytesLength) +int SoftBusChannel::SendRequestBytes(const unsigned char* bytes, const int bytesLength) { if (bytesLength == 0) { LOGE(ATM_DOMAIN, ATM_TAG, "Bytes data is invalid."); @@ -395,7 +395,7 @@ void SoftBusChannel::HandleRequest(int socket, const std::string &id, const std: LOGW(ATM_DOMAIN, ATM_TAG, "Command %{public}s cannot get from json", commandName.c_str()); int sendlen = static_cast(RPC_TRANSFER_HEAD_BYTES_LENGTH + jsonPayload.length()); - unsigned char *sendbuf = new (std::nothrow) unsigned char[sendlen + 1]; + unsigned char* sendbuf = new (std::nothrow) unsigned char[sendlen + 1]; if (sendbuf == nullptr) { LOGE(ATM_DOMAIN, ATM_TAG, "No enough memory: %{public}d", sendlen); return; @@ -424,7 +424,7 @@ void SoftBusChannel::HandleRequest(int socket, const std::string &id, const std: // send result back std::string resultJsonPayload = command->ToJsonPayload(); int len = static_cast(RPC_TRANSFER_HEAD_BYTES_LENGTH + resultJsonPayload.length()); - unsigned char *buf = new (std::nothrow) unsigned char[len + 1]; + unsigned char* buf = new (std::nothrow) unsigned char[len + 1]; if (buf == nullptr) { LOGE(ATM_DOMAIN, ATM_TAG, "No enough memory: %{public}d", len); return; @@ -453,7 +453,7 @@ void SoftBusChannel::HandleResponse(const std::string &id, const std::string &js } } -int SoftBusChannel::SendResponseBytes(int socket, const unsigned char *bytes, const int bytesLength) +int SoftBusChannel::SendResponseBytes(int socket, const unsigned char* bytes, const int bytesLength) { LOGD(ATM_DOMAIN, ATM_TAG, "Send len (after compress len)= %{public}d", bytesLength); int result = ::SendBytes(socket, bytes, bytesLength); diff --git a/services/tokensyncmanager/src/remote/soft_bus_socket_listener.cpp b/services/tokensyncmanager/src/remote/soft_bus_socket_listener.cpp index 61a921a9a32dc0082636085ee579e3e98298dda2..ec07bb7044c6c09968325b86a1341ad8ab32d103 100644 --- a/services/tokensyncmanager/src/remote/soft_bus_socket_listener.cpp +++ b/services/tokensyncmanager/src/remote/soft_bus_socket_listener.cpp @@ -95,7 +95,7 @@ bool SoftBusSocketListener::GetNetworkIdBySocket(const int32_t socket, std::stri return false; } -void SoftBusSocketListener::OnClientBytes(int32_t socket, const void *data, uint32_t dataLen) +void SoftBusSocketListener::OnClientBytes(int32_t socket, const void* data, uint32_t dataLen) { LOGI(ATM_DOMAIN, ATM_TAG, "Socket fd %{public}d, recv len %{public}d.", socket, dataLen); @@ -117,10 +117,10 @@ void SoftBusSocketListener::OnClientBytes(int32_t socket, const void *data, uint LOGE(ATM_DOMAIN, ATM_TAG, "GetExecutorChannel failed"); return; } - channel->HandleDataReceived(socket, static_cast(const_cast(data)), dataLen); + channel->HandleDataReceived(socket, static_cast(const_cast(data)), dataLen); } -void SoftBusSocketListener::OnServiceBytes(int32_t socket, const void *data, uint32_t dataLen) +void SoftBusSocketListener::OnServiceBytes(int32_t socket, const void* data, uint32_t dataLen) { LOGI(ATM_DOMAIN, ATM_TAG, "Socket fd %{public}d, recv len %{public}d.", socket, dataLen); @@ -138,7 +138,7 @@ void SoftBusSocketListener::OnServiceBytes(int32_t socket, const void *data, uin LOGE(ATM_DOMAIN, ATM_TAG, "GetExecutorChannel failed"); return; } - channel->HandleDataReceived(socket, static_cast(const_cast(data)), dataLen); + channel->HandleDataReceived(socket, static_cast(const_cast(data)), dataLen); } else { LOGE(ATM_DOMAIN, ATM_TAG, "Unkonow socket."); } diff --git a/services/tokensyncmanager/src/service/token_sync_manager_stub.cpp b/services/tokensyncmanager/src/service/token_sync_manager_stub.cpp index dcf5f4c820d63e0669c6019c25c33ce1aeeb88b5..4bc7bfa16d12f5ab4a57c3b5f80aabce58e80947 100644 --- a/services/tokensyncmanager/src/service/token_sync_manager_stub.cpp +++ b/services/tokensyncmanager/src/service/token_sync_manager_stub.cpp @@ -62,7 +62,7 @@ int32_t TokenSyncManagerStub::OnRemoteRequest( bool TokenSyncManagerStub::IsNativeProcessCalling() const { AccessTokenID tokenCaller = IPCSkeleton::GetCallingTokenID(); - uint32_t type = (reinterpret_cast(&tokenCaller))->type; + uint32_t type = (reinterpret_cast(&tokenCaller))->type; LOGD(ATM_DOMAIN, ATM_TAG, "Calling type: %{public}d", type); return type == TOKEN_NATIVE; } diff --git a/tools/accesstoken/include/atm_command.h b/tools/accesstoken/include/atm_command.h index 38ed24ff774cf5f447a3729e60d754d6b6f6fd5a..606e39d20674b97fddb6ffc715c8fc45962ce456 100644 --- a/tools/accesstoken/include/atm_command.h +++ b/tools/accesstoken/include/atm_command.h @@ -78,7 +78,7 @@ public: class AtmCommand final { public: - AtmCommand(int32_t argc, char *argv[]); + AtmCommand(int32_t argc, char* argv[]); virtual ~AtmCommand() = default; std::string ExecCommand(); @@ -87,7 +87,7 @@ private: std::string GetCommandErrorMsg() const; int32_t RunAsCommandError(void); std::string GetUnknownOptionMsg() const; - int32_t RunAsCommandMissingOptionArgument(const std::vector& requeredOptions); + int32_t RunAsCommandMissingOptionArgument(const std::vector& requiredOptions); void RunAsCommandExistentOptionForDump( const int32_t& option, AtmToolsParamInfo& info, OptType& type, std::string& permissionName); void RunAsCommandExistentOptionForPerm( diff --git a/tools/accesstoken/src/atm_command.cpp b/tools/accesstoken/src/atm_command.cpp index 2b6c2407193fadc0e413017d0380b01b9b4c81f4..3096eabc81036289bab229bfaf23cee22ba460ba 100644 --- a/tools/accesstoken/src/atm_command.cpp +++ b/tools/accesstoken/src/atm_command.cpp @@ -54,8 +54,10 @@ static const std::string HELP_MSG_DUMP = " -t, --token-info -n list single token info by specific native processName\n" #ifndef ATM_BUILD_VARIANT_USER_ENABLE " -r, --record-info [-i ] [-p ] list used records in system\n" -#endif " -v, --visit-type [-i ] [-p ] list all token used type in system\n"; +#else + ""; +#endif static const std::string HELP_MSG_PERM = #ifndef ATM_BUILD_VARIANT_USER_ENABLE @@ -104,9 +106,9 @@ static const struct option LONG_OPTIONS_PERM[] = { }; // required option -static const std::vector REQURIED_OPTIONS_DUMP = {'b', 'i', 'n', 'p'}; -static const std::vector REQURIED_OPTIONS_PERM = {'g', 'c', 'i', 'p'}; -static const std::vector REQURIED_OPTIONS_TOGGLE = {'i', 'k', 'p'}; +static const std::vector REQUIRED_OPTIONS_DUMP = {'b', 'i', 'n', 'p'}; +static const std::vector REQUIRED_OPTIONS_PERM = {'g', 'c', 'i', 'p'}; +static const std::vector REQUIRED_OPTIONS_TOGGLE = {'i', 'k', 'p'}; static const std::string SHORT_OPTIONS_TOGGLE = "hr::u::s::o::i:p:k:"; static const struct option LONG_OPTIONS_TOGGLE[] = { @@ -139,7 +141,7 @@ std::map TOGGLE_OPERATE_TYPE = { }; } -AtmCommand::AtmCommand(int32_t argc, char *argv[]) : argc_(argc), argv_(argv), name_(TOOLS_NAME) +AtmCommand::AtmCommand(int32_t argc, char* argv[]) : argc_(argc), argv_(argv), name_(TOOLS_NAME) { opterr = 0; @@ -224,13 +226,13 @@ std::string AtmCommand::GetUnknownOptionMsg() const return result; } -int32_t AtmCommand::RunAsCommandMissingOptionArgument(const std::vector& requeredOptions) +int32_t AtmCommand::RunAsCommandMissingOptionArgument(const std::vector& requiredOptions) { if (optopt == 'h') { return ERR_INVALID_VALUE; } - auto iter = std::find(requeredOptions.begin(), requeredOptions.end(), optopt); - if (iter == requeredOptions.end()) { + auto iter = std::find(requiredOptions.begin(), requiredOptions.end(), optopt); + if (iter == requiredOptions.end()) { resultReceiver_.append(GetUnknownOptionMsg()); return ERR_INVALID_VALUE; } @@ -426,11 +428,11 @@ int32_t AtmCommand::RunCommandByOperationType(const AtmToolsParamInfo& info, Opt case DUMP_RECORD: #ifndef ATM_BUILD_VARIANT_USER_ENABLE dumpInfo = DumpRecordInfo(info.tokenId, permissionName); -#endif break; case DUMP_TYPE: dumpInfo = DumpUsedTypeInfo(info.tokenId, permissionName); break; +#endif default: resultReceiver_.append("error: miss option \n"); return ERR_INVALID_VALUE; @@ -564,7 +566,7 @@ int32_t AtmCommand::RunAsCommonCommandForDump() } if (option == '?') { - result = RunAsCommandMissingOptionArgument(REQURIED_OPTIONS_DUMP); + result = RunAsCommandMissingOptionArgument(REQUIRED_OPTIONS_DUMP); break; } @@ -604,11 +606,10 @@ int32_t AtmCommand::RunAsCommonCommandForPerm() } if (option == '?') { - result = RunAsCommandMissingOptionArgument(REQURIED_OPTIONS_PERM); + result = RunAsCommandMissingOptionArgument(REQUIRED_OPTIONS_PERM); break; } if (option == 'h') { - // 'atm dump -h' result = ERR_INVALID_VALUE; continue; } @@ -647,7 +648,7 @@ int32_t AtmCommand::RunAsCommonCommandForToggle() } if (option == '?') { - result = RunAsCommandMissingOptionArgument(REQURIED_OPTIONS_TOGGLE); + result = RunAsCommandMissingOptionArgument(REQUIRED_OPTIONS_TOGGLE); break; } diff --git a/tools/accesstoken/src/main.cpp b/tools/accesstoken/src/main.cpp index 0b71dd244ae898d3551aff433e304d04f7f1f130..f54cc1e3cfd57bf37e6f967c3b912662fec14de7 100644 --- a/tools/accesstoken/src/main.cpp +++ b/tools/accesstoken/src/main.cpp @@ -16,7 +16,7 @@ #include -int main(int argc, char *argv[]) +int main(int argc, char* argv[]) { OHOS::Security::AccessToken::AtmCommand cmd(argc, argv); std::cout << cmd.ExecCommand(); diff --git a/tools/accesstoken/src/to_string.cpp b/tools/accesstoken/src/to_string.cpp index dd66f5f36c8a919097827efc099048be863fd306..071c2645f31a171b531385684cd3a6ad1739c574 100644 --- a/tools/accesstoken/src/to_string.cpp +++ b/tools/accesstoken/src/to_string.cpp @@ -38,9 +38,9 @@ static void DetailUsedRecordToJson(const std::vector& detailRe std::string ToString::PermissionUsedResultToString(const PermissionUsedResult& result) { - CJsonUnique responeJsion = CreateJson(); - (void)AddInt64ToJson(responeJsion, "beginTime", result.beginTimeMillis); - (void)AddInt64ToJson(responeJsion, "endTime", result.endTimeMillis); + CJsonUnique responseJsion = CreateJson(); + (void)AddInt64ToJson(responseJsion, "beginTime", result.beginTimeMillis); + (void)AddInt64ToJson(responseJsion, "endTime", result.endTimeMillis); CJsonUnique bundleRecordsJson = CreateJsonArray(); for (const auto& bundleRecord : result.bundleRecords) { @@ -73,17 +73,18 @@ std::string ToString::PermissionUsedResultToString(const PermissionUsedResult& r (void)AddObjToJson(bundleRecordJson, "permissionRecords", permRecordListJson); (void)AddObjToArray(bundleRecordsJson, bundleRecordJson); } - (void)AddObjToJson(responeJsion, "bundleRecords", bundleRecordsJson); - return JsonToStringFormatted(responeJsion.get()); + (void)AddObjToJson(responseJsion, "bundleRecords", bundleRecordsJson); + return JsonToStringFormatted(responseJsion.get()); } std::string ToString::PermissionUsedTypeInfoToString(const std::vector& typeInfos) { CJsonUnique useTypeInfoJson = CreateJsonArray(); - for (const auto& type : typeInfos) { + for (const auto& usedType : typeInfos) { CJsonUnique tmpJson = CreateJson(); - (void)AddUnsignedIntToJson(tmpJson, "tokenId", type.tokenId); - (void)AddStringToJson(tmpJson, "permissionName", type.permissionName); + (void)AddUnsignedIntToJson(tmpJson, "tokenId", usedType.tokenId); + (void)AddStringToJson(tmpJson, "permissionName", usedType.permissionName); + (void)AddIntToJson(tmpJson, "type", usedType.type); (void)AddObjToArray(useTypeInfoJson, tmpJson); } return JsonToStringFormatted(useTypeInfoJson.get());