From 9043ae8c0744bad4166f941c8ed32e8fa38e8171 Mon Sep 17 00:00:00 2001 From: liupengfei Date: Fri, 11 Mar 2022 13:12:36 +0800 Subject: [PATCH] Signed-off-by: liupengfei Change-Id: I329ad03456c3a71864bb814785dcd60ea94fb43d --- frameworks/common/src/random_mbedtls.cpp | 2 +- .../kits/accesstoken/napi/include/napi_atmanager.h | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/frameworks/common/src/random_mbedtls.cpp b/frameworks/common/src/random_mbedtls.cpp index f7cf0f8f1..b619b8d8f 100644 --- a/frameworks/common/src/random_mbedtls.cpp +++ b/frameworks/common/src/random_mbedtls.cpp @@ -34,7 +34,7 @@ extern "C" unsigned int GetRandomUint32() int RandomMbedtls::GenerateRandomArray(unsigned char *randStr, unsigned int len) { - if (randStr == NULL || len == 0) { + if (randStr == nullptr || len == nullptr) { return RET_FAILED; } int ret; diff --git a/interfaces/kits/accesstoken/napi/include/napi_atmanager.h b/interfaces/kits/accesstoken/napi/include/napi_atmanager.h index f6d444a78..adf43828e 100644 --- a/interfaces/kits/accesstoken/napi/include/napi_atmanager.h +++ b/interfaces/kits/accesstoken/napi/include/napi_atmanager.h @@ -26,13 +26,13 @@ namespace OHOS { namespace Security { namespace AccessToken { -#define ASYN_THREAD_EXEC_SUCC 0 -#define ASYN_THREAD_EXEC_FAIL -1 -#define ACCESSTOKEN_PERMISSION_GRANT_FAIL -1 -#define ACCESSTOKEN_PERMISSION_GRANT_SUCC 0 -#define ACCESSTOKEN_PERMISSION_REVOKE_FAIL -1 -#define ACCESSTOKEN_PERMISSION_REVOKE_SUCC 0 -#define VALUE_BUFFER_SIZE 128 +const int ASYN_THREAD_EXEC_SUCC = 0; +const int ASYN_THREAD_EXEC_FAIL = -1; +const int ACCESSTOKEN_PERMISSION_GRANT_FAIL = -1; +const int ACCESSTOKEN_PERMISSION_GRANT_SUCC = 0; +const int ACCESSTOKEN_PERMISSION_REVOKE_FAIL = -1; +const int ACCESSTOKEN_PERMISSION_REVOKE_SUCC = 0; +const int VALUE_BUFFER_SIZE = 128; static thread_local napi_ref atManagerRef_; const std::string ATMANAGER_CLASS_NAME = "atManager"; -- Gitee