From 1435e70c9b5a9e3a77d97c477367ed5e4b6bf18c Mon Sep 17 00:00:00 2001
From: lwk <1076278852@qq.com>
Date: Sat, 19 Mar 2022 21:10:22 +0800
Subject: [PATCH 01/12] fix: codex review and log liuwenkai@huawei.com

Signed-off-by: lwk <1076278852@qq.com>
---
 OAT.xml                                       |  1 -
 common/adaptor/src/adaptor_algorithm.c        | 57 ++++++------
 common/adaptor/src/adaptor_file.c             |  2 +-
 common/adaptor/src/file_operator.c            | 16 ++--
 common/coauth/src/coauth.c                    | 12 +--
 common/coauth/src/coauth_funcs.c              |  4 +-
 common/coauth/src/coauth_sign_centre.c        |  4 +-
 common/common/src/buffer.c                    | 30 +++----
 common/common/src/linked_list.c               | 22 ++---
 common/common/src/tlv_wrapper.c               |  1 -
 common/database/src/idm_database.c            | 31 ++++---
 common/database/src/idm_file_manager.c        | 50 +++++------
 common/hal_sdk/coauth_interface.cpp           | 20 ++---
 common/hal_sdk/userauth_interface.cpp         |  8 +-
 common/hal_sdk/useriam_common.cpp             |  2 +-
 common/hal_sdk/useridm_interface.cpp          | 18 ++--
 common/pool/src/pool.c                        | 16 ++--
 common/user_auth/src/context_manager.c        |  4 +-
 common/user_auth/src/user_auth_funcs.c        |  4 +-
 common/user_auth/src/user_sign_centre.c       |  6 +-
 .../kitsimpl/src/auth_executor_registry.cpp   | 22 ++---
 frameworks/kitsimpl/src/co_auth.cpp           |  8 +-
 .../kitsimpl/src/coauth_callback_proxy.cpp    | 14 +--
 .../kitsimpl/src/coauth_callback_stub.cpp     | 10 +--
 frameworks/kitsimpl/src/coauth_proxy.cpp      | 88 +++++++++----------
 .../kitsimpl/src/executor_callback_proxy.cpp  | 66 +++++++-------
 .../kitsimpl/src/executor_callback_stub.cpp   | 20 ++---
 .../kitsimpl/src/executor_messenger_proxy.cpp | 17 ++--
 .../kitsimpl/src/executor_messenger_stub.cpp  | 12 +--
 .../kitsimpl/src/query_callback_proxy.cpp     |  8 +-
 .../kitsimpl/src/query_callback_stub.cpp      |  4 +-
 .../kitsimpl/src/set_prop_callback_proxy.cpp  | 12 +--
 .../kitsimpl/src/set_prop_callback_stub.cpp   |  6 +-
 interfaces/innerkits/src/auth_attributes.cpp  |  9 +-
 interfaces/innerkits/src/auth_executor.cpp    |  6 ++
 sa_profile/useriam.rc                         | 13 +++
 services/src/auth_res_manager.cpp             | 18 ++--
 services/src/coauth_manager.cpp               | 67 +++++++-------
 services/src/executor_messenger.cpp           |  2 +-
 39 files changed, 368 insertions(+), 342 deletions(-)

diff --git a/OAT.xml b/OAT.xml
index bf16c64..c143b93 100644
--- a/OAT.xml
+++ b/OAT.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Copyright (c) 2022 Huawei Device Co., Ltd.
-
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
      You may obtain a copy of the License at
diff --git a/common/adaptor/src/adaptor_algorithm.c b/common/adaptor/src/adaptor_algorithm.c
index 5c00c12..1f4eb22 100644
--- a/common/adaptor/src/adaptor_algorithm.c
+++ b/common/adaptor/src/adaptor_algorithm.c
@@ -40,13 +40,13 @@ static KeyPair *CreateEd25519KeyPair()
     }
     keyPair->pubKey = CreateBuffer(ED25519_FIX_PUBKEY_BUFFER_SIZE);
     if (keyPair->pubKey == NULL) {
-        LOG_ERROR("no memory for pub key");
+        LOG_ERROR("no memory for public key");
         Free(keyPair);
         return NULL;
     }
     keyPair->priKey = CreateBuffer(ED25519_FIX_PRIKEY_BUFFER_SIZE);
     if (keyPair->priKey == NULL) {
-        LOG_ERROR("no memory for pri key");
+        LOG_ERROR("no memory for private key");
         DestoryBuffer(keyPair->pubKey);
         Free(keyPair);
         return NULL;
@@ -75,11 +75,11 @@ bool IsEd25519KeyPairValid(const KeyPair *keyPair)
         return false;
     }
     if (!CheckBufferWithSize(keyPair->pubKey, ED25519_FIX_PUBKEY_BUFFER_SIZE)) {
-        LOG_ERROR("invalid pub key");
+        LOG_ERROR("invalid public key");
         return false;
     }
     if (!CheckBufferWithSize(keyPair->priKey, ED25519_FIX_PRIKEY_BUFFER_SIZE)) {
-        LOG_ERROR("invalid pri key");
+        LOG_ERROR("invalid private key");
         return false;
     }
     return true;
@@ -89,32 +89,32 @@ KeyPair *GenerateEd25519KeyPair(void)
 {
     KeyPair *keyPair = CreateEd25519KeyPair();
     if (keyPair == NULL) {
-        LOG_ERROR("create key pair fail");
+        LOG_ERROR("create key pair failed");
         return NULL;
     }
     EVP_PKEY *key = NULL;
     EVP_PKEY_CTX *ctx = EVP_PKEY_CTX_new_id(EVP_PKEY_ED25519, NULL);
     if (ctx == NULL) {
-        LOG_ERROR("new ctx fail");
+        LOG_ERROR("new ctx failed");
         goto ERROR;
     }
     if (EVP_PKEY_keygen_init(ctx) != OPENSSL_SUCCESS) {
-        LOG_ERROR("init ctx fail");
+        LOG_ERROR("init ctx failed");
         goto ERROR;
     }
     if (EVP_PKEY_keygen(ctx, &key) != OPENSSL_SUCCESS) {
-        LOG_ERROR("generate key fail");
+        LOG_ERROR("generate key failed");
         goto ERROR;
     }
     size_t pubKeySize = keyPair->pubKey->maxSize;
     if (EVP_PKEY_get_raw_public_key(key, keyPair->pubKey->buf, &pubKeySize) != OPENSSL_SUCCESS) {
-        LOG_ERROR("get pub key fail");
+        LOG_ERROR("get pub key failed");
         goto ERROR;
     }
     keyPair->pubKey->contentSize = pubKeySize;
     size_t priKeySize = keyPair->priKey->maxSize;
     if (EVP_PKEY_get_raw_private_key(key, keyPair->priKey->buf, &priKeySize) != OPENSSL_SUCCESS) {
-        LOG_ERROR("get pri key fail");
+        LOG_ERROR("get pri key failed");
         goto ERROR;
     }
     keyPair->priKey->contentSize = priKeySize;
@@ -136,34 +136,34 @@ EXIT:
 int32_t Ed25519Sign(const KeyPair *keyPair, const Buffer *data, Buffer **sign)
 {
     if (!IsEd25519KeyPairValid(keyPair) || !IsBufferValid(data) || sign == NULL) {
-        LOG_ERROR("bad param");
+        LOG_ERROR("invalid params");
         return RESULT_BAD_PARAM;
     }
     int32_t ret = RESULT_GENERAL_ERROR;
     EVP_PKEY *key = EVP_PKEY_new_raw_private_key(EVP_PKEY_ED25519, NULL,
         keyPair->priKey->buf, keyPair->priKey->contentSize);
     if (key == NULL) {
-        LOG_ERROR("get pri key fail");
+        LOG_ERROR("get private key failed");
         return ret;
     }
     EVP_MD_CTX *ctx = EVP_MD_CTX_new();
     if (ctx == NULL) {
-        LOG_ERROR("get ctx fail");
+        LOG_ERROR("get ctx failed");
         EVP_PKEY_free(key);
         return ret;
     }
     if (EVP_DigestSignInit(ctx, NULL, NULL, NULL, key) != OPENSSL_SUCCESS) {
-        LOG_ERROR("init sign fail");
+        LOG_ERROR("init sign failed");
         goto EXIT;
     }
     *sign = CreateBuffer(ED25519_FIX_SIGN_BUFFER_SIZE);
     if (!IsBufferValid(*sign)) {
-        LOG_ERROR("create buffer fail");
+        LOG_ERROR("create buffer failed");
         goto EXIT;
     }
     size_t signSize = (*sign)->maxSize;
     if (EVP_DigestSign(ctx, (*sign)->buf, &signSize, data->buf, data->contentSize) != OPENSSL_SUCCESS) {
-        LOG_ERROR("sign fail");
+        LOG_ERROR("sign failed");
         DestoryBuffer(*sign);
         *sign = NULL;
         goto EXIT;
@@ -187,21 +187,21 @@ int32_t Ed25519Verify(const Buffer *pubKey, const Buffer *data, const Buffer *si
     int32_t ret = RESULT_GENERAL_ERROR;
     EVP_PKEY *key = EVP_PKEY_new_raw_public_key(EVP_PKEY_ED25519, NULL, pubKey->buf, pubKey->contentSize);
     if (key == NULL) {
-        LOG_ERROR("get pub key fail");
+        LOG_ERROR("get pub key failed");
         return ret;
     }
     EVP_MD_CTX *ctx = EVP_MD_CTX_new();
     if (ctx == NULL) {
-        LOG_ERROR("get ctx fail");
+        LOG_ERROR("get ctx failed");
         EVP_PKEY_free(key);
         return ret;
     }
     if (EVP_DigestVerifyInit(ctx, NULL, NULL, NULL, key) != OPENSSL_SUCCESS) {
-        LOG_ERROR("init verify fail");
+        LOG_ERROR("init verify failed");
         goto EXIT;
     }
     if (EVP_DigestVerify(ctx, sign->buf, sign->contentSize, data->buf, data->contentSize) != OPENSSL_SUCCESS) {
-        LOG_ERROR("verify fail");
+        LOG_ERROR("verify failed");
         goto EXIT;
     }
     ret = RESULT_SUCCESS;
@@ -212,8 +212,7 @@ EXIT:
     return ret;
 }
 
-static int32_t IamHmac(const EVP_MD *alg,
-    const Buffer *hmacKey, const Buffer *data, Buffer *hmac)
+static int32_t IamHmac(const EVP_MD *alg, const Buffer *hmacKey, const Buffer *data, Buffer *hmac)
 {
     if (!IsBufferValid(hmacKey) || hmacKey->contentSize > INT_MAX ||
         !IsBufferValid(data) || !IsBufferValid(hmac) || hmac->maxSize > UINT_MAX) {
@@ -224,7 +223,7 @@ static int32_t IamHmac(const EVP_MD *alg,
     uint8_t *hmacData = HMAC(alg, hmacKey->buf, (int)hmacKey->contentSize, data->buf, data->contentSize,
         hmac->buf, &hmacSize);
     if (hmacData == NULL) {
-        LOG_ERROR("hmac fail");
+        LOG_ERROR("hmac failed");
         return RESULT_GENERAL_ERROR;
     }
     hmac->contentSize = hmacSize;
@@ -244,13 +243,13 @@ int32_t HmacSha256(const Buffer *hmacKey, const Buffer *data, Buffer **hmac)
     }
     *hmac = CreateBuffer(SHA256_DIGEST_SIZE);
     if (*hmac == NULL) {
-        LOG_ERROR("create buffer fail");
+        LOG_ERROR("create buffer failed");
         return RESULT_NO_MEMORY;
     }
     if (IamHmac(alg, hmacKey, data, *hmac) != RESULT_SUCCESS) {
         DestoryBuffer(*hmac);
         *hmac = NULL;
-        LOG_ERROR("hmac fail");
+        LOG_ERROR("hmac failed");
         return RESULT_GENERAL_ERROR;
     }
     return RESULT_SUCCESS;
@@ -269,13 +268,13 @@ int32_t HmacSha512(const Buffer *hmacKey, const Buffer *data, Buffer **hmac)
     }
     *hmac = CreateBuffer(SHA512_DIGEST_SIZE);
     if (*hmac == NULL) {
-        LOG_ERROR("create buffer fail");
+        LOG_ERROR("create buffer failed");
         return RESULT_NO_MEMORY;
     }
     if (IamHmac(alg, hmacKey, data, *hmac) != RESULT_SUCCESS) {
         DestoryBuffer(*hmac);
         *hmac = NULL;
-        LOG_ERROR("hmac fail");
+        LOG_ERROR("hmac failed");
         return RESULT_GENERAL_ERROR;
     }
     return RESULT_SUCCESS;
@@ -284,11 +283,11 @@ int32_t HmacSha512(const Buffer *hmacKey, const Buffer *data, Buffer **hmac)
 int32_t SecureRandom(uint8_t *buffer, uint32_t size)
 {
     if (buffer == NULL || size > INT_MAX) {
-        LOG_ERROR("bad param");
+        LOG_ERROR("bad paramed");
         return RESULT_BAD_PARAM;
     }
     if (RAND_bytes(buffer, (int)size) != OPENSSL_SUCCESS) {
-        LOG_ERROR("rand fail");
+        LOG_ERROR("rand failed");
         return RESULT_GENERAL_ERROR;
     }
     return RESULT_SUCCESS;
diff --git a/common/adaptor/src/adaptor_file.c b/common/adaptor/src/adaptor_file.c
index 4252afa..441ff78 100644
--- a/common/adaptor/src/adaptor_file.c
+++ b/common/adaptor/src/adaptor_file.c
@@ -50,7 +50,7 @@ bool IsFileOperatorValid(const FileOperator *fileOperator)
 FileOperator *GetFileOperator(const FileOperatorType type)
 {
     if (type == DEFAULT_FILE_OPERATOR) {
-        LOG_INFO("Get default file operator");
+        LOG_INFO("get default file operator");
         return GetDefaultFileOperator();
     }
     return NULL;
diff --git a/common/adaptor/src/file_operator.c b/common/adaptor/src/file_operator.c
index b5c52d5..dc13184 100644
--- a/common/adaptor/src/file_operator.c
+++ b/common/adaptor/src/file_operator.c
@@ -41,12 +41,12 @@ static int32_t ReadFile(const char *fileName, uint8_t *buf, uint32_t len)
     }
     FILE *fileOperator = fopen(fileName, "rb");
     if (fileOperator == NULL) {
-        LOG_ERROR("open file fail");
+        LOG_ERROR("open file failed");
         return RESULT_BAD_PARAM;
     }
     size_t readLen = fread(buf, sizeof(uint8_t), len, fileOperator);
     if (readLen != len) {
-        LOG_ERROR("read file fail");
+        LOG_ERROR("read file failed");
         (void)fclose(fileOperator);
         (void)memset_s(buf, len, 0, len);
         return RESULT_BAD_READ;
@@ -63,12 +63,12 @@ static int32_t WriteFile(const char *fileName, const uint8_t *buf, uint32_t len)
     }
     FILE *fileOperator = fopen(fileName, "wb");
     if (fileOperator == NULL) {
-        LOG_ERROR("open file fail");
+        LOG_ERROR("open file failed");
         return RESULT_BAD_PARAM;
     }
     size_t writeLen = fwrite(buf, sizeof(uint8_t), len, fileOperator);
     if (writeLen != len) {
-        LOG_ERROR("write file fail");
+        LOG_ERROR("write file failed");
         (void)fclose(fileOperator);
         return RESULT_BAD_WRITE;
     }
@@ -85,17 +85,17 @@ static int32_t GetFileLen(const char *fileName, uint32_t *len)
     *len = 0;
     FILE *fileOperator = fopen(fileName, "rb");
     if (fileOperator == NULL) {
-        LOG_ERROR("fopen file fail");
+        LOG_ERROR("fopen file failed");
         return RESULT_BAD_PARAM;
     }
     if (fseek(fileOperator, 0L, SEEK_END) != 0) {
-        LOG_ERROR("seek file fail");
+        LOG_ERROR("seek file failed");
         (void)fclose(fileOperator);
         return RESULT_GENERAL_ERROR;
     }
     long fileLen = ftell(fileOperator);
     if (fileLen < 0 || fileLen > UINT32_MAX) {
-        LOG_ERROR("tell file fail");
+        LOG_ERROR("tell file failed");
         (void)fclose(fileOperator);
         return RESULT_GENERAL_ERROR;
     }
@@ -112,7 +112,7 @@ static int32_t DeleteFile(const char *fileName)
     }
     int ret = remove(fileName);
     if (ret != 0) {
-        LOG_ERROR("delete file fail");
+        LOG_ERROR("delete file failed");
         return RESULT_GENERAL_ERROR;
     }
     return RESULT_SUCCESS;
diff --git a/common/coauth/src/coauth.c b/common/coauth/src/coauth.c
index 9a4f56a..ad247e5 100644
--- a/common/coauth/src/coauth.c
+++ b/common/coauth/src/coauth.c
@@ -80,13 +80,13 @@ ResultCode AddCoAuthSchedule(CoAuthSchedule *coAuthSchedule)
         return RESULT_NO_MEMORY;
     }
     if (memcpy_s(schedule, sizeof(CoAuthSchedule), coAuthSchedule, sizeof(CoAuthSchedule)) != EOK) {
-        LOG_ERROR("copy fail");
+        LOG_ERROR("copy failed");
         Free(schedule);
         return RESULT_BAD_COPY;
     }
     ResultCode result = g_scheduleList->insert(g_scheduleList, schedule);
     if (result != RESULT_SUCCESS) {
-        LOG_ERROR("insert fail");
+        LOG_ERROR("insert failed");
         Free(schedule);
         return result;
     }
@@ -125,7 +125,7 @@ ResultCode GetCoAuthSchedule(CoAuthSchedule *coAuthSchedule)
     }
     LinkedListIterator *iterator = g_scheduleList->createIterator(g_scheduleList);
     if (iterator == NULL) {
-        LOG_ERROR("create iterator fail");
+        LOG_ERROR("create iterator failed");
         return RESULT_NO_MEMORY;
     }
     int32_t result = RESULT_BAD_MATCH;
@@ -135,7 +135,7 @@ ResultCode GetCoAuthSchedule(CoAuthSchedule *coAuthSchedule)
             continue;
         }
         if (memcpy_s(coAuthSchedule, sizeof(CoAuthSchedule), schedule, sizeof(CoAuthSchedule)) != EOK) {
-            LOG_ERROR("memcpy fail");
+            LOG_ERROR("memcpy failed");
             result = RESULT_BAD_COPY;
             break;
         }
@@ -230,7 +230,7 @@ CoAuthSchedule *GenerateAuthSchedule(uint64_t contextId, uint32_t authType, uint
         return NULL;
     }
     if (memset_s(coAuthSchedule, sizeof(CoAuthSchedule), 0, sizeof(CoAuthSchedule)) != EOK) {
-        LOG_ERROR("reset coAuthSchedule fail");
+        LOG_ERROR("reset coAuthSchedule failed");
         goto EXIT;
     }
     ResultCode ret = GenerateValidScheduleId(&coAuthSchedule->scheduleId);
@@ -265,7 +265,7 @@ CoAuthSchedule *GenerateIdmSchedule(uint64_t challenge, uint32_t authType, uint6
         return NULL;
     }
     if (memset_s(coAuthSchedule, sizeof(CoAuthSchedule), 0, sizeof(CoAuthSchedule)) != EOK) {
-        LOG_ERROR("reset coAuthSchedule fail");
+        LOG_ERROR("reset coAuthSchedule failed");
         goto EXIT;
     }
     ResultCode ret = GenerateValidScheduleId(&coAuthSchedule->scheduleId);
diff --git a/common/coauth/src/coauth_funcs.c b/common/coauth/src/coauth_funcs.c
index b66043d..24fb535 100644
--- a/common/coauth/src/coauth_funcs.c
+++ b/common/coauth/src/coauth_funcs.c
@@ -152,12 +152,12 @@ bool IsExecutorExistFunc(uint32_t authType)
     LinkedList *executorsQuery = NULL;
     int32_t ret = QueryExecutor(authType, &executorsQuery);
     if (ret != RESULT_SUCCESS || executorsQuery == NULL) {
-        LOG_ERROR("query executor fail");
+        LOG_ERROR("query executor failed");
         return false;
     }
 
     if (executorsQuery->getSize(executorsQuery) == 0) {
-        LOG_ERROR("get size fail");
+        LOG_ERROR("get size failed");
         DestroyLinkedList(executorsQuery);
         return false;
     }
diff --git a/common/coauth/src/coauth_sign_centre.c b/common/coauth/src/coauth_sign_centre.c
index 02fbac8..925e0ce 100644
--- a/common/coauth/src/coauth_sign_centre.c
+++ b/common/coauth/src/coauth_sign_centre.c
@@ -46,7 +46,7 @@ static bool IsTimeValid(const ScheduleTokenHal *coAuthToken)
 ResultCode CoAuthTokenSign(ScheduleTokenHal *coAuthToken)
 {
     if (coAuthToken == NULL) {
-        LOG_ERROR("coAuthToken is NULL");
+        LOG_ERROR("coAuthToken is null");
         return RESULT_BAD_PARAM;
     }
     coAuthToken->version = TOKEN_VERSION;
@@ -81,7 +81,7 @@ EXIT:
 ResultCode CoAuthTokenVerify(const ScheduleTokenHal *coAuthToken)
 {
     if (coAuthToken == NULL) {
-        LOG_ERROR("coAuthToken is NULL");
+        LOG_ERROR("coAuthToken is null");
         return RESULT_BAD_PARAM;
     }
 
diff --git a/common/common/src/buffer.c b/common/common/src/buffer.c
index f227b23..0a01245 100644
--- a/common/common/src/buffer.c
+++ b/common/common/src/buffer.c
@@ -45,19 +45,19 @@ bool CheckBufferWithSize(const Buffer *buffer, const uint32_t size)
 Buffer *CreateBuffer(const uint32_t size)
 {
     if ((size == 0) || (size > MAX_BUFFER_SIZE)) {
-        LOG_ERROR("Bad param size:%u", size);
+        LOG_ERROR("invalid param, size: %u", size);
         return NULL;
     }
 
     Buffer *buffer = (Buffer *)Malloc(sizeof(Buffer));
     if (buffer == NULL) {
-        LOG_ERROR("Get buffer struct error");
+        LOG_ERROR("malloc buffer struct failed");
         return NULL;
     }
 
     buffer->buf = (uint8_t *)Malloc(size);
     if (buffer->buf == NULL) {
-        LOG_ERROR("Get buffer error");
+        LOG_ERROR("malloc buffer data failed");
         Free(buffer);
         return NULL;
     }
@@ -76,25 +76,25 @@ Buffer *CreateBuffer(const uint32_t size)
 Buffer *CreateBufferByData(const uint8_t *data, const uint32_t dataSize)
 {
     if ((data == NULL) || (dataSize == 0) || (dataSize > MAX_BUFFER_SIZE)) {
-        LOG_ERROR("Bad param size:%u", dataSize);
+        LOG_ERROR("invalid param, size: %u", size);
         return NULL;
     }
 
     Buffer *buffer = (Buffer *)Malloc(sizeof(Buffer));
     if (buffer == NULL) {
-        LOG_ERROR("Get buffer struct error");
+        LOG_ERROR("malloc buffer struct failed");
         return NULL;
     }
 
     buffer->buf = (uint8_t *)Malloc(dataSize);
     if (buffer->buf == NULL) {
-        LOG_ERROR("Get buffer error");
+        LOG_ERROR("malloc buffer data failed");
         Free(buffer);
         return NULL;
     }
 
     if (memcpy_s(buffer->buf, dataSize, data, dataSize) != EOK) {
-        LOG_ERROR("Cpy buffer error");
+        LOG_ERROR("copy buffer failed");
         DestoryBuffer(buffer);
         return NULL;
     }
@@ -107,12 +107,12 @@ Buffer *CreateBufferByData(const uint8_t *data, const uint32_t dataSize)
 ResultCode InitBuffer(Buffer *buffer, const uint8_t *buf, const uint32_t bufSize)
 {
     if (!IsBufferValid(buffer) || (buf == NULL) || (bufSize == 0)) {
-        LOG_ERROR("Bad param");
+        LOG_ERROR("invalid params");
         return RESULT_BAD_PARAM;
     }
 
     if (memcpy_s(buffer->buf, buffer->maxSize, buf, bufSize) != EOK) {
-        LOG_ERROR("Copy buffer fail");
+        LOG_ERROR("copy buffer failed");
         return RESULT_BAD_COPY;
     }
     buffer->contentSize = bufSize;
@@ -125,7 +125,7 @@ void DestoryBuffer(Buffer *buffer)
     if (buffer != NULL) {
         if (buffer->buf != NULL) {
             if (memset_s(buffer->buf, buffer->maxSize, 0, buffer->maxSize) != EOK) {
-                LOG_ERROR("DestoryBuffer memset fail!");
+                LOG_ERROR("meset failed");
             }
             Free(buffer->buf);
             buffer->buf = NULL;
@@ -139,18 +139,18 @@ void DestoryBuffer(Buffer *buffer)
 Buffer *CopyBuffer(const Buffer *buffer)
 {
     if (!IsBufferValid(buffer)) {
-        LOG_ERROR("Invalid buffer");
+        LOG_ERROR("invalid buffer");
         return NULL;
     }
 
     Buffer *copyBuffer = CreateBuffer(buffer->maxSize);
     if (copyBuffer == NULL) {
-        LOG_ERROR("Invalid buffer");
+        LOG_ERROR("create buffer failed");
         return NULL;
     }
 
     if (memcpy_s(copyBuffer->buf, copyBuffer->maxSize, buffer->buf, buffer->contentSize) != EOK) {
-        LOG_ERROR("Copy buffer fail");
+        LOG_ERROR("copy buffer failed");
         goto FAIL;
     }
     copyBuffer->contentSize = buffer->contentSize;
@@ -178,11 +178,11 @@ bool CompareBuffer(const Buffer *buffer1, const Buffer *buffer2)
 ResultCode GetBufferData(const Buffer *buffer, uint8_t *data, uint32_t *dataSize)
 {
     if (!IsBufferValid(buffer) || (data == NULL) || (dataSize == NULL)) {
-        LOG_ERROR("Bad param");
+        LOG_ERROR("invalid params");
         return RESULT_BAD_PARAM;
     }
     if (memcpy_s(data, *dataSize, buffer->buf, buffer->contentSize) != EOK) {
-        LOG_ERROR("Copy buffer fail");
+        LOG_ERROR("copy buffer failed");
         return RESULT_BAD_COPY;
     }
     *dataSize = buffer->contentSize;
diff --git a/common/common/src/linked_list.c b/common/common/src/linked_list.c
index d81cfde..326dc77 100644
--- a/common/common/src/linked_list.c
+++ b/common/common/src/linked_list.c
@@ -23,7 +23,7 @@
 static ResultCode InsertNode(LinkedList *list, void *data)
 {
     if (list == NULL) {
-        LOG_ERROR("get null list");
+        LOG_ERROR("list is null");
         return RESULT_BAD_PARAM;
     }
     if (list->size == UINT32_MAX) {
@@ -45,11 +45,11 @@ static ResultCode InsertNode(LinkedList *list, void *data)
 static ResultCode RemoveNode(LinkedList *list, void *condition, MatchFunc matchFunc, bool destroyNode)
 {
     if (list == NULL) {
-        LOG_ERROR("get null list");
+        LOG_ERROR("list is null");
         return RESULT_BAD_PARAM;
     }
     if (matchFunc == NULL) {
-        LOG_ERROR("get null match func");
+        LOG_ERROR("matchFunc is null");
         return RESULT_BAD_PARAM;
     }
     LinkedListNode *pre = NULL;
@@ -83,7 +83,7 @@ static ResultCode RemoveNode(LinkedList *list, void *condition, MatchFunc matchF
 static uint32_t GetSize(LinkedList *list)
 {
     if (list == NULL) {
-        LOG_ERROR("get null list");
+        LOG_ERROR("list is null");
         return 0;
     }
     return list->size;
@@ -92,7 +92,7 @@ static uint32_t GetSize(LinkedList *list)
 static bool IteratorHasNext(LinkedListIterator *iterator)
 {
     if (iterator == NULL) {
-        LOG_ERROR("get null iterator");
+        LOG_ERROR("iterator is null");
         return false;
     }
     return iterator->current != NULL;
@@ -112,12 +112,12 @@ static void *IteratorNext(LinkedListIterator *iterator)
 static LinkedListIterator *CreateIterator(struct LinkedList *list)
 {
     if (list == NULL) {
-        LOG_ERROR("get null list");
+        LOG_ERROR("list is null");
         return NULL;
     }
     LinkedListIterator *iterator = (LinkedListIterator *)Malloc(sizeof(LinkedListIterator));
     if (iterator == NULL) {
-        LOG_ERROR("bad memory");
+        LOG_ERROR("malloc failed");
         return NULL;
     }
     iterator->current = list->head;
@@ -129,7 +129,7 @@ static LinkedListIterator *CreateIterator(struct LinkedList *list)
 static void DestroyIterator(LinkedListIterator *iterator)
 {
     if (iterator == NULL) {
-        LOG_ERROR("get null iterator");
+        LOG_ERROR("iterator is null");
         return;
     }
     Free(iterator);
@@ -138,7 +138,7 @@ static void DestroyIterator(LinkedListIterator *iterator)
 LinkedList *CreateLinkedList(DestroyDataFunc destroyDataFunc)
 {
     if (destroyDataFunc == NULL) {
-        LOG_ERROR("get null func");
+        LOG_ERROR("destroyDataFunc is null");
         return NULL;
     }
     LinkedList *list = Malloc(sizeof(LinkedList));
@@ -160,7 +160,7 @@ LinkedList *CreateLinkedList(DestroyDataFunc destroyDataFunc)
 static void DestroyLinkedListNode(const LinkedList *list, LinkedListNode *node)
 {
     if (node == NULL) {
-        LOG_ERROR("get null node");
+        LOG_ERROR("node is null");
         return;
     }
     if ((list != NULL) && (list->destroyDataFunc != NULL)) {
@@ -172,7 +172,7 @@ static void DestroyLinkedListNode(const LinkedList *list, LinkedListNode *node)
 void DestroyLinkedList(LinkedList *list)
 {
     if (list == NULL) {
-        LOG_ERROR("get null list");
+        LOG_ERROR("list is null");
         return;
     }
     while (list->head != NULL) {
diff --git a/common/common/src/tlv_wrapper.c b/common/common/src/tlv_wrapper.c
index 4ea84f1..1ba297d 100644
--- a/common/common/src/tlv_wrapper.c
+++ b/common/common/src/tlv_wrapper.c
@@ -324,7 +324,6 @@ int32_t ParseUint8Para(TlvListNode *node, int32_t msgType, uint8_t *retVal)
     return OPERA_SUCC;
 }
 
-
 int32_t GetUint64Para(TlvListNode *head, int32_t msgType, uint64_t *retVal)
 {
     if ((head == NULL) || (retVal == NULL)) {
diff --git a/common/database/src/idm_database.c b/common/database/src/idm_database.c
index ac24e23..86dc01f 100644
--- a/common/database/src/idm_database.c
+++ b/common/database/src/idm_database.c
@@ -67,7 +67,7 @@ void DestroyUserInfoList(void)
 static bool MatchUserInfo(void *data, void *condition)
 {
     if (data == NULL || condition == NULL) {
-        LOG_ERROR("Please check invalid node");
+        LOG_ERROR("params is null, please check invalid node");
         return false;
     }
     UserInfo *userInfo = (UserInfo *)data;
@@ -103,7 +103,7 @@ ResultCode GetSecureUid(int32_t userId, uint64_t *secUid)
     }
     UserInfo *user = QueryUserInfo(userId);
     if (user == NULL) {
-        LOG_ERROR("Can't find this user");
+        LOG_ERROR("can't find this user");
         return RESULT_NOT_FOUND;
     }
     *secUid = user->secUid;
@@ -234,14 +234,14 @@ static ResultCode GetAllEnrolledInfoFromUser(UserInfo *userInfo, EnrolledInfoHal
     ResultCode result = RESULT_SUCCESS;
     for (*num = 0; *num < size; (*num)++) {
         if (temp == NULL) {
-            LOG_ERROR("Temp node is NULL, something wrong");
+            LOG_ERROR("temp node is null, something wrong");
             result = RESULT_BAD_PARAM;
             goto EXIT;
         }
         EnrolledInfoHal *tempInfo = (EnrolledInfoHal *)temp->data;
         if (memcpy_s(*enrolledInfos + *num, sizeof(EnrolledInfoHal) * (size - *num),
             tempInfo, sizeof(EnrolledInfoHal)) != EOK) {
-            LOG_ERROR("Failed to copy the %d information", *num);
+            LOG_ERROR("copy the %d information failed", *num);
             result = RESULT_NO_MEMORY;
             goto EXIT;
         }
@@ -266,18 +266,20 @@ static ResultCode GetAllCredentialInfoFromUser(UserInfo *userInfo, CredentialInf
         LOG_ERROR("credentialInfos malloc failed");
         return RESULT_NO_MEMORY;
     }
+    (void)memset_s(*credentialInfos, sizeof(CredentialInfoHal) * size, 0, sizeof(CredentialInfoHal) * size);
     LinkedListNode *temp = credentialInfoList->head;
     ResultCode result = RESULT_SUCCESS;
-    for (*num = 0; *num < size; (*num)++) {
+    uint32_t cnt;
+    for (cnt = 0; cnt < size; cnt++) {
         if (temp == NULL) {
-            LOG_ERROR("Temp node is NULL, something wrong");
+            LOG_ERROR("temp node is NULL, something wrong");
             result = RESULT_BAD_PARAM;
             goto EXIT;
         }
         CredentialInfoHal *tempInfo = (CredentialInfoHal *)temp->data;
-        if (memcpy_s((*credentialInfos) + *num, sizeof(CredentialInfoHal) * (size - *num),
+        if (memcpy_s((*credentialInfos) + cnt, sizeof(CredentialInfoHal) * (size - cnt),
             tempInfo, sizeof(CredentialInfoHal)) != EOK) {
-            LOG_ERROR("Failed to copy the %d information", *num);
+            LOG_ERROR("copy the %u information failed", cnt);
             result = RESULT_NO_MEMORY;
             goto EXIT;
         }
@@ -291,6 +293,7 @@ EXIT:
         *credentialInfos = NULL;
         *num = 0;
     }
+    *num = cnt;
     return result;
 }
 
@@ -389,7 +392,7 @@ static ResultCode GenerateDeduplicateUint64(LinkedList *collection, uint64_t *de
         }
     }
 
-    LOG_ERROR("generate random fail");
+    LOG_ERROR("generate random failed");
     return RESULT_GENERAL_ERROR;
 }
 
@@ -594,7 +597,7 @@ ResultCode DeleteCredentialInfo(int32_t userId, uint64_t credentialId, Credentia
     LinkedList *credentialList = user->credentialInfoList;
     CredentialInfoHal *credentialQuery = QueryCredentialById(credentialId, credentialList);
     if (credentialQuery == NULL) {
-        LOG_ERROR("don't have this credential");
+        LOG_ERROR("credentialQuery is null");
         return RESULT_UNKNOWN;
     }
     if (memcpy_s(credentialInfo, sizeof(CredentialInfoHal), credentialQuery, sizeof(CredentialInfoHal)) != EOK) {
@@ -665,21 +668,21 @@ ResultCode QueryCredentialInfo(int32_t userId, uint32_t authType, CredentialInfo
 {
     UserInfo *user = QueryUserInfo(userId);
     if (user == NULL) {
-        LOG_ERROR("Can't find this user, userId is %{public}d", userId);
+        LOG_ERROR("can't find this user, userId is %{public}d", userId);
         return RESULT_NOT_FOUND;
     }
     LinkedList *credentialList = user->credentialInfoList;
     if (credentialList == NULL) {
-        LOG_ERROR("CredentialList is null");
+        LOG_ERROR("credentialList is null");
         return RESULT_NOT_FOUND;
     }
     CredentialInfoHal *credentialQuery = QueryCredentialByAuthType(authType, credentialList);
     if (credentialQuery == NULL) {
-        LOG_ERROR("Don't have this credential");
+        LOG_ERROR("credentialQuery is null");
         return RESULT_NOT_FOUND;
     }
     if (memcpy_s(credentialInfo, sizeof(CredentialInfoHal), credentialQuery, sizeof(CredentialInfoHal)) != EOK) {
-        LOG_ERROR("credentialInfo copy failed");
+        LOG_ERROR("copy credentialInfo failed");
         return RESULT_BAD_COPY;
     }
     return RESULT_SUCCESS;
diff --git a/common/database/src/idm_file_manager.c b/common/database/src/idm_file_manager.c
index a587331..a65278a 100644
--- a/common/database/src/idm_file_manager.c
+++ b/common/database/src/idm_file_manager.c
@@ -42,7 +42,7 @@ static uint8_t *GetStreamAddress(const Buffer *object)
 static ResultCode CapacityExpansion(Buffer *object, uint32_t targetCapacity)
 {
     if (!IsBufferValid(object) || object->maxSize > MAX_BUFFER_LEN / DEFAULT_EXPANSION_RATIO) {
-        LOG_ERROR("Params are invalid");
+        LOG_ERROR("invalid params");
         return RESULT_BAD_PARAM;
     }
     uint32_t targetSize = object->maxSize;
@@ -50,16 +50,16 @@ static ResultCode CapacityExpansion(Buffer *object, uint32_t targetCapacity)
         targetSize = targetSize * DEFAULT_EXPANSION_RATIO;
     }
     if (targetSize < targetCapacity) {
-        LOG_ERROR("Target capacity can not reach");
+        LOG_ERROR("target capacity can not reach");
         return RESULT_BAD_PARAM;
     }
     uint8_t *buf = Malloc(targetSize);
     if (buf == NULL) {
-        LOG_ERROR("Malloc failed");
+        LOG_ERROR("malloc failed");
         return RESULT_NO_MEMORY;
     }
     if (memcpy_s(buf, targetSize, object->buf, object->contentSize) != EOK) {
-        LOG_ERROR("Copy failed");
+        LOG_ERROR("copy failed");
         Free(buf);
         return RESULT_NO_MEMORY;
     }
@@ -72,7 +72,7 @@ static ResultCode CapacityExpansion(Buffer *object, uint32_t targetCapacity)
 static ResultCode StreamWrite(Buffer *parcel, void *from, uint32_t size)
 {
     if (!IsBufferValid(parcel) || from == NULL) {
-        LOG_ERROR("Param is invalid");
+        LOG_ERROR("invalid params");
         return RESULT_BAD_PARAM;
     }
     if (GetRemainSpace(parcel) < size) {
@@ -83,7 +83,7 @@ static ResultCode StreamWrite(Buffer *parcel, void *from, uint32_t size)
         }
     }
     if (memcpy_s(GetStreamAddress(parcel), GetRemainSpace(parcel), from, size) != EOK) {
-        LOG_ERROR("Copy failed");
+        LOG_ERROR("copy failed");
         return RESULT_NO_MEMORY;
     }
     parcel->contentSize += size;
@@ -93,7 +93,7 @@ static ResultCode StreamWrite(Buffer *parcel, void *from, uint32_t size)
 static ResultCode StreamWriteEnrolledInfo(Buffer *parcel, LinkedList *enrolledList)
 {
     if (!IsBufferValid(parcel) || enrolledList == NULL) {
-        LOG_ERROR("Param is invalid");
+        LOG_ERROR("invalid params");
         return RESULT_BAD_PARAM;
     }
     uint32_t size = enrolledList->getSize(enrolledList);
@@ -105,11 +105,11 @@ static ResultCode StreamWriteEnrolledInfo(Buffer *parcel, LinkedList *enrolledLi
     LinkedListNode *temp = enrolledList->head;
     for (uint32_t i = 0; i < size; i++) {
         if (temp == NULL) {
-            LOG_ERROR("ListSize is invalid");
+            LOG_ERROR("listSize is invalid");
             return RESULT_BAD_PARAM;
         }
         if (StreamWrite(parcel, temp->data, sizeof(EnrolledInfoHal)) != RESULT_SUCCESS) {
-            LOG_ERROR("EnrolledInfo streamWrite failed");
+            LOG_ERROR("enrolledInfo streamWrite failed");
             return RESULT_GENERAL_ERROR;
         }
         temp = temp->next;
@@ -120,7 +120,7 @@ static ResultCode StreamWriteEnrolledInfo(Buffer *parcel, LinkedList *enrolledLi
 static ResultCode StreamWriteCredentialList(Buffer *parcel, LinkedList *credentialList)
 {
     if (!IsBufferValid(parcel) || credentialList == NULL) {
-        LOG_ERROR("Param is invalid");
+        LOG_ERROR("invalid params");
         return RESULT_BAD_PARAM;
     }
     uint32_t size = credentialList->getSize(credentialList);
@@ -132,11 +132,11 @@ static ResultCode StreamWriteCredentialList(Buffer *parcel, LinkedList *credenti
     LinkedListNode *temp = credentialList->head;
     for (uint32_t i = 0; i < size; i++) {
         if (temp == NULL) {
-            LOG_ERROR("ListSize is invalid");
+            LOG_ERROR("listSize is invalid");
             return RESULT_BAD_PARAM;
         }
         if (StreamWrite(parcel, temp->data, sizeof(CredentialInfoHal)) != RESULT_SUCCESS) {
-            LOG_ERROR("CredentialInfo streamWrite failed");
+            LOG_ERROR("credentialInfo streamWrite failed");
             return RESULT_GENERAL_ERROR;
         }
         temp = temp->next;
@@ -147,7 +147,7 @@ static ResultCode StreamWriteCredentialList(Buffer *parcel, LinkedList *credenti
 static ResultCode StreamWriteUserInfo(Buffer *parcel, UserInfo *userInfo)
 {
     if (!IsBufferValid(parcel) || userInfo == NULL) {
-        LOG_ERROR("Param is invalid");
+        LOG_ERROR("invalid params");
         return RESULT_BAD_PARAM;
     }
     ResultCode result;
@@ -176,7 +176,7 @@ static ResultCode StreamWriteUserInfo(Buffer *parcel, UserInfo *userInfo)
 
 ResultCode UpdateFileInfo(LinkedList *userInfoList)
 {
-    LOG_INFO("update begin");
+    LOG_INFO("start");
     if (userInfoList == NULL) {
         LOG_ERROR("userInfo list is null");
         return RESULT_BAD_PARAM;
@@ -216,7 +216,7 @@ ResultCode UpdateFileInfo(LinkedList *userInfoList)
 
     FileOperator *fileOperator = GetFileOperator(DEFAULT_FILE_OPERATOR);
     if (!IsFileOperatorValid(fileOperator)) {
-        LOG_ERROR("Invalid file operation");
+        LOG_ERROR("invalid file operation");
         ret = RESULT_BAD_WRITE;
         goto EXIT;
     }
@@ -224,7 +224,7 @@ ResultCode UpdateFileInfo(LinkedList *userInfoList)
     // This is for example only. Should be implemented in trusted environment.
     ret = fileOperator->writeFile(IDM_USER_INFO, parcel->buf, parcel->contentSize);
     if (ret != RESULT_SUCCESS) {
-        LOG_ERROR("file write failed, %{public}u", parcel->contentSize);
+        LOG_ERROR("write file failed, %{public}u", parcel->contentSize);
     }
 
 EXIT:
@@ -235,11 +235,11 @@ EXIT:
 static ResultCode StreamRead(Buffer *parcel, uint32_t *index, void *to, uint32_t size)
 {
     if (parcel->contentSize <= *index || parcel->contentSize - *index < size) {
-        LOG_ERROR("The buffer length is insufficient.");
+        LOG_ERROR("the buffer length is insufficient");
         return RESULT_BAD_PARAM;
     }
     if (memcpy_s(to, size, parcel->buf + *index, size) != EOK) {
-        LOG_ERROR("Copy failed");
+        LOG_ERROR("copy failed");
         return RESULT_NO_MEMORY;
     }
     *index += size;
@@ -249,7 +249,7 @@ static ResultCode StreamRead(Buffer *parcel, uint32_t *index, void *to, uint32_t
 static ResultCode StreamReadCredentialList(Buffer *parcel, uint32_t *index, LinkedList *credentialList)
 {
     if (!IsBufferValid(parcel) || credentialList == NULL) {
-        LOG_ERROR("Param is invalid");
+        LOG_ERROR("invalid params");
         return RESULT_BAD_PARAM;
     }
     uint32_t credentialNum;
@@ -282,7 +282,7 @@ static ResultCode StreamReadCredentialList(Buffer *parcel, uint32_t *index, Link
 static ResultCode StreamReadEnrolledList(Buffer *parcel, uint32_t *index, LinkedList *enrolledList)
 {
     if (!IsBufferValid(parcel) || enrolledList == NULL) {
-        LOG_ERROR("Param is invalid");
+        LOG_ERROR("invalid params");
         return RESULT_BAD_PARAM;
     }
     uint32_t enrolledNum;
@@ -292,7 +292,7 @@ static ResultCode StreamReadEnrolledList(Buffer *parcel, uint32_t *index, Linked
         return RESULT_BAD_READ;
     }
     if (enrolledNum > MAX_CREDENTIAL) {
-        LOG_ERROR("Bad enrolled num");
+        LOG_ERROR("bad enrolled num");
         return RESULT_BAD_READ;
     }
     for (uint32_t i = 0; i < enrolledNum; i++) {
@@ -341,7 +341,7 @@ static Buffer *ReadFileInfo()
 {
     FileOperator *fileOperator = GetFileOperator(DEFAULT_FILE_OPERATOR);
     if (!IsFileOperatorValid(fileOperator)) {
-        LOG_ERROR("Invalid file operation");
+        LOG_ERROR("invalid file operation");
         return NULL;
     }
     uint32_t fileSize;
@@ -405,10 +405,10 @@ static bool StreamReadFileInfo(Buffer *parcel, LinkedList *userInfoList)
 
 LinkedList *LoadFileInfo(void)
 {
-    LOG_INFO("begin");
+    LOG_INFO("start");
     FileOperator *fileOperator = GetFileOperator(DEFAULT_FILE_OPERATOR);
     if (!IsFileOperatorValid(fileOperator)) {
-        LOG_ERROR("Invalid file operation");
+        LOG_ERROR("invalid file operation");
         return NULL;
     }
     if (!fileOperator->isFileExist(IDM_USER_INFO)) {
@@ -423,7 +423,7 @@ LinkedList *LoadFileInfo(void)
 
     LinkedList *userInfoList = CreateLinkedList(DestroyUserInfoNode);
     if (userInfoList == NULL) {
-        LOG_ERROR("List create failed");
+        LOG_ERROR("list create failed");
         DestoryBuffer(parcel);
         return NULL;
     }
diff --git a/common/hal_sdk/coauth_interface.cpp b/common/hal_sdk/coauth_interface.cpp
index 8f4448d..7ee56ec 100644
--- a/common/hal_sdk/coauth_interface.cpp
+++ b/common/hal_sdk/coauth_interface.cpp
@@ -35,7 +35,7 @@ static ExecutorInfo CopyExecutorInfoOut(const ExecutorInfoHal &executorInfoHal)
     executorInfo.esl = executorInfoHal.esl;
     executorInfo.executorType = executorInfoHal.executorType;
     if (memcpy_s(executorInfo.publicKey, PUBLIC_KEY_LEN, executorInfoHal.pubKey, PUBLIC_KEY_LEN) != EOK) {
-        LOG_ERROR("memcpy fail");
+        LOG_ERROR("memcpy failed");
     }
     return executorInfo;
 }
@@ -48,14 +48,14 @@ static ExecutorInfoHal CopyExecutorInfoIn(const ExecutorInfo &executorInfo)
     executorInfoHal.esl = executorInfo.esl;
     executorInfoHal.executorType = executorInfo.executorType;
     if (memcpy_s(executorInfoHal.pubKey, PUBLIC_KEY_LEN, executorInfo.publicKey, PUBLIC_KEY_LEN) != EOK) {
-        LOG_ERROR("memcpy fail");
+        LOG_ERROR("memcpy faied");
     }
     return executorInfoHal;
 }
 
 static void CopyScheduleInfoOut(ScheduleInfo &scheduleInfo, const ScheduleInfoHal &scheduleInfoHal)
 {
-    LOG_INFO("begin");
+    LOG_INFO("start");
     scheduleInfo.executors.clear();
     scheduleInfo.authSubType = scheduleInfoHal.authSubType;
     scheduleInfo.templateId = scheduleInfoHal.templateId;
@@ -68,7 +68,7 @@ static void CopyScheduleInfoOut(ScheduleInfo &scheduleInfo, const ScheduleInfoHa
 
 int32_t GetScheduleInfo(uint64_t scheduleId, ScheduleInfo &scheduleInfo)
 {
-    LOG_INFO("begin");
+    LOG_INFO("start");
     GlobalLock();
     ScheduleInfoHal scheduleInfoHal;
     int32_t ret = GetScheduleInfo(scheduleId, &scheduleInfoHal);
@@ -84,7 +84,7 @@ int32_t GetScheduleInfo(uint64_t scheduleId, ScheduleInfo &scheduleInfo)
 
 int32_t DeleteScheduleInfo(uint64_t scheduleId, ScheduleInfo &scheduleInfo)
 {
-    LOG_INFO("begin");
+    LOG_INFO("start");
     GlobalLock();
     ScheduleInfoHal scheduleInfoHal;
     int32_t ret = GetScheduleInfo(scheduleId, &scheduleInfoHal);
@@ -102,14 +102,14 @@ int32_t DeleteScheduleInfo(uint64_t scheduleId, ScheduleInfo &scheduleInfo)
 
 static Buffer *CreateBufferByVector(std::vector<uint8_t> &executorFinishMsg)
 {
-    LOG_INFO("executorFinishMsg size is %{public}u", executorFinishMsg.size());
+    LOG_INFO("executorFinishMsg size is %{public}zu", executorFinishMsg.size());
     Buffer *data = CreateBufferByData(&executorFinishMsg[0], executorFinishMsg.size());
     return data;
 }
 
 int32_t GetScheduleToken(std::vector<uint8_t> executorFinishMsg, ScheduleToken &scheduleToken)
 {
-    LOG_INFO("begin");
+    LOG_INFO("start");
     if (executorFinishMsg.empty()) {
         LOG_ERROR("executorFinishMsg is empty");
         ScheduleInfo scheduleInfo;
@@ -143,7 +143,7 @@ int32_t GetScheduleToken(std::vector<uint8_t> executorFinishMsg, ScheduleToken &
 
 int32_t ExecutorRegister(ExecutorInfo executorInfo, uint64_t &executorId)
 {
-    LOG_INFO("begin");
+    LOG_INFO("start");
     GlobalLock();
     ExecutorInfoHal executorInfoHal = CopyExecutorInfoIn(executorInfo);
     int32_t ret = RegisterExecutor(&executorInfoHal, &executorId);
@@ -153,7 +153,7 @@ int32_t ExecutorRegister(ExecutorInfo executorInfo, uint64_t &executorId)
 
 int32_t ExecutorUnRegister(uint64_t executorId)
 {
-    LOG_INFO("begin");
+    LOG_INFO("start");
     GlobalLock();
     int32_t ret = UnRegisterExecutor(executorId);
     GlobalUnLock();
@@ -162,7 +162,7 @@ int32_t ExecutorUnRegister(uint64_t executorId)
 
 bool IsExecutorExist(uint32_t authType)
 {
-    LOG_INFO("begin");
+    LOG_INFO("start");
     GlobalLock();
     bool ret = IsExecutorExistFunc(authType);
     GlobalUnLock();
diff --git a/common/hal_sdk/userauth_interface.cpp b/common/hal_sdk/userauth_interface.cpp
index 685af7c..b2b51b2 100644
--- a/common/hal_sdk/userauth_interface.cpp
+++ b/common/hal_sdk/userauth_interface.cpp
@@ -30,7 +30,7 @@ namespace UserIAM {
 namespace UserAuth {
 int32_t GenerateSolution(AuthSolution param, std::vector<uint64_t> &scheduleIds)
 {
-    LOG_INFO("begin");
+    LOG_INFO("start");
     GlobalLock();
     uint64_t *scheduleIdsGet = nullptr;
     uint32_t scheduleIdNum = 0;
@@ -57,7 +57,7 @@ int32_t GenerateSolution(AuthSolution param, std::vector<uint64_t> &scheduleIds)
 int32_t RequestAuthResult(uint64_t contextId, std::vector<uint8_t> &scheduleToken, UserAuthToken &authToken,
     std::vector<uint64_t> &scheduleIds)
 {
-    LOG_INFO("begin");
+    LOG_INFO("start");
     GlobalLock();
     if (scheduleToken.size() != sizeof(CoAuth::ScheduleToken)) {
         LOG_ERROR("param is invalid");
@@ -98,7 +98,7 @@ int32_t RequestAuthResult(uint64_t contextId, std::vector<uint8_t> &scheduleToke
 
 int32_t CancelContext(uint64_t contextId, std::vector<uint64_t> &scheduleIds)
 {
-    LOG_INFO("begin");
+    LOG_INFO("start");
     GlobalLock();
     uint64_t *scheduleIdsGet = nullptr;
     uint32_t scheduleIdNum = 0;
@@ -118,7 +118,7 @@ int32_t CancelContext(uint64_t contextId, std::vector<uint64_t> &scheduleIds)
 
 int32_t GetAuthTrustLevel(int32_t userId, uint32_t authType, uint32_t &authTrustLevel)
 {
-    LOG_INFO("begin");
+    LOG_INFO("start");
     GlobalLock();
     int32_t ret = SingleAuthTrustLevel(userId, authType, &authTrustLevel);
     GlobalUnLock();
diff --git a/common/hal_sdk/useriam_common.cpp b/common/hal_sdk/useriam_common.cpp
index c5f3775..59feb41 100644
--- a/common/hal_sdk/useriam_common.cpp
+++ b/common/hal_sdk/useriam_common.cpp
@@ -36,7 +36,7 @@ static bool g_isInitUserIAM = false;
 int32_t Init()
 {
     GlobalLock();
-    LOG_INFO("check useriam folder exist or init it.");
+    LOG_INFO("check useriam folder exist or init it");
     if (IDM_USER_FOLDER && access(IDM_USER_FOLDER, 0) == -1) {
         mkdir(IDM_USER_FOLDER, S_IRWXU);
     }
diff --git a/common/hal_sdk/useridm_interface.cpp b/common/hal_sdk/useridm_interface.cpp
index cce3c57..1b3bd67 100644
--- a/common/hal_sdk/useridm_interface.cpp
+++ b/common/hal_sdk/useridm_interface.cpp
@@ -53,7 +53,7 @@ int32_t CloseSession()
 int32_t InitSchedulation(std::vector<uint8_t> authToken, int32_t userId, uint32_t authType, uint64_t authSubType,
     uint64_t &scheduleId)
 {
-    LOG_INFO("begin");
+    LOG_INFO("start");
     GlobalLock();
     if (authToken.size() != sizeof(UserAuth::UserAuthToken) && authType != PIN_AUTH) {
         LOG_ERROR("authToken len is invalid");
@@ -76,7 +76,7 @@ int32_t InitSchedulation(std::vector<uint8_t> authToken, int32_t userId, uint32_
 
 int32_t DeleteScheduleId(uint64_t &scheduleId)
 {
-    LOG_INFO("begin");
+    LOG_INFO("start");
     GlobalLock();
     int32_t ret = CancelScheduleIdFunc(&scheduleId);
     GlobalUnLock();
@@ -85,7 +85,7 @@ int32_t DeleteScheduleId(uint64_t &scheduleId)
 
 int32_t AddCredential(std::vector<uint8_t> enrollToken, uint64_t &credentialId)
 {
-    LOG_INFO("begin");
+    LOG_INFO("start");
     GlobalLock();
     if (enrollToken.size() != sizeof(CoAuth::ScheduleToken)) {
         LOG_ERROR("enrollToken is invalid, size is %{public}zu", enrollToken.size());
@@ -106,7 +106,7 @@ int32_t AddCredential(std::vector<uint8_t> enrollToken, uint64_t &credentialId)
 int32_t DeleteCredential(int32_t userId, uint64_t credentialId, std::vector<uint8_t> authToken,
     CredentialInfo &credentialInfo)
 {
-    LOG_INFO("begin");
+    LOG_INFO("start");
     GlobalLock();
     authToken.resize(sizeof(UserAuth::UserAuthToken));
     if (authToken.size() != sizeof(UserAuth::UserAuthToken)) {
@@ -140,7 +140,7 @@ int32_t DeleteCredential(int32_t userId, uint64_t credentialId, std::vector<uint
 
 int32_t QueryCredential(int32_t userId, uint32_t authType, std::vector<CredentialInfo> &credentialInfos)
 {
-    LOG_INFO("begin");
+    LOG_INFO("start");
     GlobalLock();
     CredentialInfoHal *credentialInfoHals = nullptr;
     uint32_t num = 0;
@@ -169,7 +169,7 @@ int32_t QueryCredential(int32_t userId, uint32_t authType, std::vector<Credentia
 
 int32_t GetSecureUid(int32_t userId, uint64_t &secureUid, std::vector<EnrolledInfo> &enrolledInfos)
 {
-    LOG_INFO("begin");
+    LOG_INFO("start");
     GlobalLock();
     EnrolledInfoHal *enrolledInfoHals = nullptr;
     uint32_t num = 0;
@@ -197,7 +197,7 @@ int32_t GetSecureUid(int32_t userId, uint64_t &secureUid, std::vector<EnrolledIn
 
 int32_t DeleteUserEnforce(int32_t userId, std::vector<CredentialInfo> &credentialInfos)
 {
-    LOG_INFO("begin");
+    LOG_INFO("start");
     GlobalLock();
     CredentialInfoHal *credentialInfoHals = nullptr;
     uint32_t num = 0;
@@ -227,7 +227,7 @@ int32_t DeleteUserEnforce(int32_t userId, std::vector<CredentialInfo> &credentia
 
 int32_t DeleteUser(int32_t userId, std::vector<uint8_t> authToken, std::vector<CredentialInfo> &credentialInfos)
 {
-    LOG_INFO("begin");
+    LOG_INFO("start");
     GlobalLock();
     authToken.resize(sizeof(UserAuthTokenHal));
     if (authToken.size() != sizeof(UserAuthTokenHal)) {
@@ -260,7 +260,7 @@ int32_t DeleteUser(int32_t userId, std::vector<uint8_t> authToken, std::vector<C
 
 int32_t UpdateCredential(std::vector<uint8_t> enrollToken, uint64_t &credentialId, CredentialInfo &deletedCredential)
 {
-    LOG_INFO("begin");
+    LOG_INFO("start");
     GlobalLock();
     if (enrollToken.size() != sizeof(CoAuth::ScheduleToken)) {
         LOG_ERROR("enrollToken is invalid");
diff --git a/common/pool/src/pool.c b/common/pool/src/pool.c
index df8b902..636393d 100644
--- a/common/pool/src/pool.c
+++ b/common/pool/src/pool.c
@@ -142,17 +142,17 @@ ResultCode RegisterExecutorToPool(ExecutorInfoHal *executorInfo)
     }
     ResultCode result = GenerateValidExecutorId(&executorInfo->executorId);
     if (result != RESULT_SUCCESS) {
-        LOG_ERROR("get executorId fail");
+        LOG_ERROR("get executorId failed");
         return result;
     }
     ExecutorInfoHal *executorCopy = CopyExecutorInfo(executorInfo);
     if (executorCopy == NULL) {
-        LOG_ERROR("copy executor fail");
+        LOG_ERROR("copy executor failed");
         return RESULT_NO_MEMORY;
     }
     result = g_poolList->insert(g_poolList, (void *)executorCopy);
     if (result != RESULT_SUCCESS) {
-        LOG_ERROR("insert fail");
+        LOG_ERROR("insert failed");
         DestroyExecutorInfo(executorCopy);
         return result;
     }
@@ -180,7 +180,7 @@ ExecutorInfoHal *CopyExecutorInfo(ExecutorInfoHal *src)
         return NULL;
     }
     if (memcpy_s(dest, sizeof(ExecutorInfoHal), src, sizeof(ExecutorInfoHal)) != EOK) {
-        LOG_ERROR("copy executor info fail");
+        LOG_ERROR("copy executor info failed");
         Free(dest);
         return NULL;
     }
@@ -199,12 +199,12 @@ ResultCode QueryExecutor(uint32_t authType, LinkedList **result)
     }
     *result = CreateLinkedList(DestroyExecutorInfo);
     if (*result == NULL) {
-        LOG_ERROR("create result list fail");
+        LOG_ERROR("create result list failed");
         return RESULT_NO_MEMORY;
     }
     LinkedListIterator *iterator = g_poolList->createIterator(g_poolList);
     if (iterator == NULL) {
-        LOG_ERROR("create iterator fail");
+        LOG_ERROR("create iterator failed");
         DestroyLinkedList(*result);
         return RESULT_NO_MEMORY;
     }
@@ -220,11 +220,11 @@ ResultCode QueryExecutor(uint32_t authType, LinkedList **result)
         }
         ExecutorInfoHal *copy = CopyExecutorInfo(executorInfo);
         if (copy == NULL) {
-            LOG_ERROR("copy executor info fail");
+            LOG_ERROR("copy executor info failed");
             continue;
         }
         if ((*result)->insert(*result, copy) != RESULT_SUCCESS) {
-            LOG_ERROR("insert executor info fail");
+            LOG_ERROR("insert executor info failed");
             DestroyExecutorInfo(copy);
             continue;
         }
diff --git a/common/user_auth/src/context_manager.c b/common/user_auth/src/context_manager.c
index 09c3877..61fbcc1 100644
--- a/common/user_auth/src/context_manager.c
+++ b/common/user_auth/src/context_manager.c
@@ -57,7 +57,7 @@ static void CopyParamToContext(UserAuthContext *context, AuthSolutionHal params)
 
 UserAuthContext *GenerateContext(AuthSolutionHal params)
 {
-    LOG_INFO("begin");
+    LOG_INFO("start");
     if (g_contextList == NULL) {
         LOG_ERROR("need init");
         return NULL;
@@ -134,7 +134,7 @@ static void DestroyScheduleNode(void *data)
 
 static ResultCode CreateSchedules(UserAuthContext *context)
 {
-    LOG_INFO("begin");
+    LOG_INFO("start");
     context->scheduleList = CreateLinkedList(DestroyScheduleNode);
     if (context->scheduleList == NULL) {
         LOG_ERROR("schedule list create failed");
diff --git a/common/user_auth/src/user_auth_funcs.c b/common/user_auth/src/user_auth_funcs.c
index c5c2b38..f62396b 100644
--- a/common/user_auth/src/user_auth_funcs.c
+++ b/common/user_auth/src/user_auth_funcs.c
@@ -80,7 +80,7 @@ int32_t RequestAuthResultFunc(uint64_t contextId, const Buffer *scheduleToken, U
     }
     int32_t ret = CoAuthTokenVerify(&scheduleTokenStruct);
     if (ret != RESULT_SUCCESS) {
-        LOG_ERROR("failed to verify the token");
+        LOG_ERROR("verify token failed");
         return RESULT_BAD_SIGN;
     }
 
@@ -120,7 +120,7 @@ int32_t CancelContextFunc(uint64_t contextId, uint64_t **scheduleIdArray, uint32
 {
     UserAuthContext *authContext = GetContext(contextId);
     if (authContext == NULL) {
-        LOG_ERROR("don't have this context");
+        LOG_ERROR("get context failed");
         return RESULT_NOT_FOUND;
     }
     int32_t ret = GetScheduleIds(authContext, scheduleIdArray, scheduleNum);
diff --git a/common/user_auth/src/user_sign_centre.c b/common/user_auth/src/user_sign_centre.c
index 95000a9..909334c 100644
--- a/common/user_auth/src/user_sign_centre.c
+++ b/common/user_auth/src/user_sign_centre.c
@@ -47,7 +47,7 @@ static bool IsTimeValid(const UserAuthTokenHal *userAuthToken)
 ResultCode UserAuthTokenSign(UserAuthTokenHal *userAuthToken)
 {
     if (userAuthToken == NULL) {
-        LOG_ERROR("userAuthToken is NULL");
+        LOG_ERROR("userAuthToken is null");
         return RESULT_BAD_PARAM;
     }
     userAuthToken->version = TOKEN_VERSION;
@@ -82,7 +82,7 @@ EXIT:
 ResultCode UserAuthTokenVerify(const UserAuthTokenHal *userAuthToken)
 {
     if (userAuthToken == NULL) {
-        LOG_ERROR("userAuthToken is NULL");
+        LOG_ERROR("userAuthToken is null");
         return RESULT_BAD_PARAM;
     }
 
@@ -107,7 +107,7 @@ ResultCode UserAuthTokenVerify(const UserAuthTokenHal *userAuthToken)
     }
 
     if (!CompareBuffer(rightSign, sign)) {
-        LOG_ERROR("sign compare failed ");
+        LOG_ERROR("sign compare failed");
         ret = RESULT_BAD_SIGN;
     }
 
diff --git a/frameworks/kitsimpl/src/auth_executor_registry.cpp b/frameworks/kitsimpl/src/auth_executor_registry.cpp
index 807edd6..3bd5288 100644
--- a/frameworks/kitsimpl/src/auth_executor_registry.cpp
+++ b/frameworks/kitsimpl/src/auth_executor_registry.cpp
@@ -35,23 +35,23 @@ sptr<CoAuth::ICoAuth> AuthExecutorRegistry::GetProxy()
 
     sptr<ISystemAbilityManager> sam = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager();
     if (sam == nullptr) {
-        COAUTH_HILOGE(MODULE_INNERKIT, "Failed to get system ability manager");
+        COAUTH_HILOGE(MODULE_INNERKIT, "get system ability manager failed");
         return nullptr;
     }
     sptr<IRemoteObject> obj = sam->CheckSystemAbility(SUBSYS_USERIAM_SYS_ABILITY_AUTHEXECUTORMGR);
     if (obj == nullptr) {
-        COAUTH_HILOGE(MODULE_INNERKIT, "Failed to get coauth service");
+        COAUTH_HILOGE(MODULE_INNERKIT, "get coauth service failed");
         return nullptr;
     }
     sptr<IRemoteObject::DeathRecipient> dr = new AuthExecutorRegistryDeathRecipient();
     if ((obj->IsProxyObject()) && (!obj->AddDeathRecipient(dr))) {
-        COAUTH_HILOGE(MODULE_INNERKIT, "Failed to add death recipient");
+        COAUTH_HILOGE(MODULE_INNERKIT, "add death recipient failed");
         return nullptr;
     }
 
     proxy_ = iface_cast<CoAuth::ICoAuth>(obj);
     deathRecipient_ = dr;
-    COAUTH_HILOGI(MODULE_INNERKIT, "Succeed to connect coauth service");
+    COAUTH_HILOGI(MODULE_INNERKIT, "connect coauth service success");
     return proxy_;
 }
 
@@ -69,16 +69,16 @@ void AuthExecutorRegistry::ResetProxy(const wptr<IRemoteObject>& remote)
 }
 
 uint64_t AuthExecutorRegistry::Register(std::shared_ptr<AuthExecutor> executorInfo,
-                                        std::shared_ptr<ExecutorCallback> callback)
+    std::shared_ptr<ExecutorCallback> callback)
 {
     COAUTH_HILOGD(MODULE_INNERKIT, "Register start");
     if (executorInfo == nullptr || callback == nullptr) {
-        COAUTH_HILOGE(MODULE_INNERKIT, "Register failed,executorInfo or callback is nullptr");
+        COAUTH_HILOGE(MODULE_INNERKIT, "executorInfo or callback is nullptr");
         return FAIL;
     }
     auto proxy = GetProxy();
     if (proxy == nullptr) {
-        COAUTH_HILOGE(MODULE_INNERKIT, "GetProxy is nullptr");
+        COAUTH_HILOGE(MODULE_INNERKIT, "proxy is nullptr");
         return FAIL;
     }
     sptr<IExecutorCallback> iExecutorCallback = new ExecutorCallbackStub(callback);
@@ -89,12 +89,12 @@ void AuthExecutorRegistry::QueryStatus(AuthExecutor &executorInfo, std::shared_p
 {
     COAUTH_HILOGD(MODULE_INNERKIT, "QueryStatus start");
     if (callback == nullptr) {
-        COAUTH_HILOGE(MODULE_INNERKIT, "QueryStatus failed, callback is nullptr");
+        COAUTH_HILOGE(MODULE_INNERKIT, "callback is nullptr");
         return;
     }
     auto proxy = GetProxy();
     if (proxy == nullptr) {
-        COAUTH_HILOGE(MODULE_INNERKIT, "GetProxy is nullptr");
+        COAUTH_HILOGE(MODULE_INNERKIT, "proxy is nullptr");
         return;
     }
     sptr<IQueryCallback> iQueryCallback = new QueryCallbackStub(callback);
@@ -104,12 +104,12 @@ void AuthExecutorRegistry::QueryStatus(AuthExecutor &executorInfo, std::shared_p
 void AuthExecutorRegistry::AuthExecutorRegistryDeathRecipient::OnRemoteDied(const wptr<IRemoteObject>& remote)
 {
     if (remote == nullptr) {
-        COAUTH_HILOGE(MODULE_INNERKIT, "OnRemoteDied failed, remote is nullptr");
+        COAUTH_HILOGE(MODULE_INNERKIT, "remote is nullptr");
         return;
     }
 
     AuthExecutorRegistry::GetInstance().ResetProxy(remote);
-    COAUTH_HILOGE(MODULE_INNERKIT, "CoAuthDeathRecipient::Recv death notice.");
+    COAUTH_HILOGE(MODULE_INNERKIT, "AuthExecutorRegistryDeathRecipient::Recv death notice");
 }
 } // namespace AuthResPool
 } // namespace UserIAM
diff --git a/frameworks/kitsimpl/src/co_auth.cpp b/frameworks/kitsimpl/src/co_auth.cpp
index b8a5fb7..c703050 100644
--- a/frameworks/kitsimpl/src/co_auth.cpp
+++ b/frameworks/kitsimpl/src/co_auth.cpp
@@ -36,23 +36,23 @@ sptr<ICoAuth> CoAuth::GetProxy()
 
     sptr<ISystemAbilityManager> sam = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager();
     if (sam == nullptr) {
-        COAUTH_HILOGE(MODULE_INNERKIT, "Failed to get system ability manager");
+        COAUTH_HILOGE(MODULE_INNERKIT, "get system ability manager failed");
         return nullptr;
     }
     sptr<IRemoteObject> obj = sam->CheckSystemAbility(SUBSYS_USERIAM_SYS_ABILITY_AUTHEXECUTORMGR);
     if (obj == nullptr) {
-        COAUTH_HILOGE(MODULE_INNERKIT, "Failed to get coauth manager service");
+        COAUTH_HILOGE(MODULE_INNERKIT, "get coauth manager service failed");
         return nullptr;
     }
     sptr<IRemoteObject::DeathRecipient> dr = new CoAuthDeathRecipient();
     if ((obj->IsProxyObject()) && (!obj->AddDeathRecipient(dr))) {
-        COAUTH_HILOGE(MODULE_INNERKIT, "Failed to add death recipient");
+        COAUTH_HILOGE(MODULE_INNERKIT, "add death recipient failed");
         return nullptr;
     }
 
     proxy_ = iface_cast<ICoAuth>(obj);
     deathRecipient_ = dr;
-    COAUTH_HILOGD(MODULE_INNERKIT, "Succeed to connect coauth manager service");
+    COAUTH_HILOGD(MODULE_INNERKIT, "connect coauth manager service success");
     return proxy_;
 }
 
diff --git a/frameworks/kitsimpl/src/coauth_callback_proxy.cpp b/frameworks/kitsimpl/src/coauth_callback_proxy.cpp
index f57166b..9fa9c3f 100644
--- a/frameworks/kitsimpl/src/coauth_callback_proxy.cpp
+++ b/frameworks/kitsimpl/src/coauth_callback_proxy.cpp
@@ -28,16 +28,16 @@ void CoAuthCallbackProxy::OnFinish(uint32_t resultCode, std::vector<uint8_t> &sc
     MessageParcel reply;
 
     if (!data.WriteInterfaceToken(CoAuthCallbackProxy::GetDescriptor())) {
-        COAUTH_HILOGE(MODULE_INNERKIT, "write descriptor failed!");
+        COAUTH_HILOGE(MODULE_INNERKIT, "write descriptor failed");
         return;
     }
     if (!data.WriteUint32(resultCode)) {
-        COAUTH_HILOGE(MODULE_INNERKIT, "failed to WriteUint32(resultCode).");
+        COAUTH_HILOGE(MODULE_INNERKIT, "write resultCode failed");
         return;
     }
 
     if (!data.WriteUInt8Vector(scheduleToken)) {
-        COAUTH_HILOGE(MODULE_INNERKIT, "failed to WriteUInt8Vector(scheduleToken).");
+        COAUTH_HILOGE(MODULE_INNERKIT, "write scheduleToken failed");
         return;
     }
 
@@ -51,11 +51,11 @@ void CoAuthCallbackProxy::OnAcquireInfo(uint32_t acquire)
 {
     MessageParcel data;
     if (!data.WriteInterfaceToken(CoAuthCallbackProxy::GetDescriptor())) {
-        COAUTH_HILOGE(MODULE_INNERKIT, "write descriptor failed!");
+        COAUTH_HILOGE(MODULE_INNERKIT, "write descriptor failed");
         return;
     }
     if (!data.WriteUint32(acquire)) {
-        COAUTH_HILOGE(MODULE_INNERKIT, "failed to WriteUint32(acquire).");
+        COAUTH_HILOGE(MODULE_INNERKIT, "write acquire failed");
         return;
     }
 
@@ -70,13 +70,13 @@ bool CoAuthCallbackProxy::SendRequest(uint32_t code, MessageParcel &data, Messag
 {
     sptr<IRemoteObject> remote = Remote();
     if (remote == nullptr) {
-        COAUTH_HILOGE(MODULE_INNERKIT, "failed to get remote.");
+        COAUTH_HILOGE(MODULE_INNERKIT, "get remote failed");
         return false;
     }
     MessageOption option(MessageOption::TF_SYNC);
     int32_t result = remote->SendRequest(code, data, reply, option);
     if (result != OHOS::NO_ERROR) {
-        COAUTH_HILOGE(MODULE_INNERKIT, "failed to SendRequest.result = %{public}d", result);
+        COAUTH_HILOGE(MODULE_INNERKIT, "send request failed, result = %{public}d", result);
         return false;
     }
     return true;
diff --git a/frameworks/kitsimpl/src/coauth_callback_stub.cpp b/frameworks/kitsimpl/src/coauth_callback_stub.cpp
index 313ed19..a19d5d0 100644
--- a/frameworks/kitsimpl/src/coauth_callback_stub.cpp
+++ b/frameworks/kitsimpl/src/coauth_callback_stub.cpp
@@ -32,7 +32,7 @@ int32_t CoAuthCallbackStub::OnRemoteRequest(uint32_t code, MessageParcel &data,
     std::u16string descripter = CoAuthCallbackStub::GetDescriptor();
     std::u16string remoteDescripter = data.ReadInterfaceToken();
     if (descripter != remoteDescripter) {
-        COAUTH_HILOGD(MODULE_INNERKIT, "CoAuthStub::OnRemoteRequest failed, descriptor is not matched!");
+        COAUTH_HILOGD(MODULE_INNERKIT, "descriptor is not matched!");
         return FAIL;
     }
     switch (code) {
@@ -47,18 +47,18 @@ int32_t CoAuthCallbackStub::OnRemoteRequest(uint32_t code, MessageParcel &data,
 
 int32_t CoAuthCallbackStub::OnFinishStub(MessageParcel &data, MessageParcel &reply)
 {
+    (void)reply;
     uint32_t resultCode = data.ReadUint32();
     std::vector<uint8_t> scheduleToken;
     data.ReadUInt8Vector(&scheduleToken);
-
     OnFinish(resultCode, scheduleToken);
     return SUCCESS;
 }
 
 int32_t CoAuthCallbackStub::OnAcquireInfoStub(MessageParcel &data, MessageParcel &reply)
 {
+    (void)reply;
     uint32_t acquire = data.ReadUint32();
-
     OnAcquireInfo(acquire);
     return SUCCESS;
 }
@@ -66,7 +66,7 @@ int32_t CoAuthCallbackStub::OnAcquireInfoStub(MessageParcel &data, MessageParcel
 void CoAuthCallbackStub::OnFinish(uint32_t resultCode, std::vector<uint8_t> &scheduleToken)
 {
     if (callback_ == nullptr) {
-        COAUTH_HILOGE(MODULE_INNERKIT, "CoAuthCallback is null.");
+        COAUTH_HILOGE(MODULE_INNERKIT, "callback_ is null.");
     } else {
         callback_->OnFinish(resultCode, scheduleToken);
     }
@@ -75,7 +75,7 @@ void CoAuthCallbackStub::OnFinish(uint32_t resultCode, std::vector<uint8_t> &sch
 void CoAuthCallbackStub::OnAcquireInfo(uint32_t acquire)
 {
     if (callback_ == nullptr) {
-        COAUTH_HILOGE(MODULE_INNERKIT, "CoAuthCallback is null.");
+        COAUTH_HILOGE(MODULE_INNERKIT, "callback_ is null.");
     } else {
         callback_->OnAcquireInfo(acquire);
     }
diff --git a/frameworks/kitsimpl/src/coauth_proxy.cpp b/frameworks/kitsimpl/src/coauth_proxy.cpp
index 6f3812a..b79a859 100644
--- a/frameworks/kitsimpl/src/coauth_proxy.cpp
+++ b/frameworks/kitsimpl/src/coauth_proxy.cpp
@@ -67,57 +67,57 @@ uint32_t CoAuthProxy::WriteAuthExecutor(AuthResPool::AuthExecutor &executorInfo,
 }
 
 uint64_t CoAuthProxy::Register(std::shared_ptr<AuthResPool::AuthExecutor> executorInfo,
-                               const sptr<AuthResPool::IExecutorCallback> &callback)
+    const sptr<AuthResPool::IExecutorCallback> &callback)
 {
     COAUTH_HILOGD(MODULE_INNERKIT, "Register start");
     if (executorInfo == nullptr || callback == nullptr) {
-        COAUTH_HILOGE(MODULE_INNERKIT, "Register failed, executorInfo or callback is nullptr");
+        COAUTH_HILOGE(MODULE_INNERKIT, "executorInfo or callback is nullptr");
         return 0;
     }
     MessageParcel data;
     MessageParcel reply;
     if (!data.WriteInterfaceToken(CoAuthProxy::GetDescriptor())) {
-        COAUTH_HILOGE(MODULE_INNERKIT, "write descriptor failed!");
+        COAUTH_HILOGE(MODULE_INNERKIT, "write descriptor failed");
         return 0;
     }
     if (WriteAuthExecutor(*executorInfo, data) == FAIL) {
-        COAUTH_HILOGE(MODULE_INNERKIT, "write executorInfo failed!");
+        COAUTH_HILOGE(MODULE_INNERKIT, "write executorInfo failed");
         return 0;
     }
     if (!data.WriteRemoteObject(callback->AsObject())) {
-        COAUTH_HILOGE(MODULE_INNERKIT, "failed to WriteRemoteObject(callback).");
+        COAUTH_HILOGE(MODULE_INNERKIT, "write callback filed");
         return 0;
     }
     uint64_t result = 0;
     bool ret = SendRequest(static_cast<int32_t>(ICoAuth::COAUTH_EXECUTOR_REGIST), data, reply);
     if (!ret) {
-        COAUTH_HILOGE(MODULE_INNERKIT, "failed to SendRequest.");
+        COAUTH_HILOGE(MODULE_INNERKIT, "send request failed");
         return 0;
     }
     if (!reply.ReadUint64(result)) {
-        COAUTH_HILOGE(MODULE_INNERKIT, "failed to ReadUint64.");
+        COAUTH_HILOGE(MODULE_INNERKIT, "read result failed");
         return 0;
     }
     return result;
 }
 
 void CoAuthProxy::QueryStatus(AuthResPool::AuthExecutor &executorInfo,
-                              const sptr<AuthResPool::IQueryCallback> &callback)
+    const sptr<AuthResPool::IQueryCallback> &callback)
 {
     MessageParcel data;
     MessageParcel reply;
 
     if (!data.WriteInterfaceToken(CoAuthProxy::GetDescriptor())) {
-        COAUTH_HILOGE(MODULE_INNERKIT, "write descriptor failed!");
+        COAUTH_HILOGE(MODULE_INNERKIT, "write descriptor failed");
         return;
     }
     if (WriteAuthExecutor(executorInfo, data) == FAIL) {
-        COAUTH_HILOGE(MODULE_INNERKIT, "write executorInfo failed!");
+        COAUTH_HILOGE(MODULE_INNERKIT, "write executorInfo failed");
         return;
     }
 
     if (!data.WriteRemoteObject(callback->AsObject())) {
-        COAUTH_HILOGE(MODULE_INNERKIT, "failed to WriteRemoteObject(callback).");
+        COAUTH_HILOGE(MODULE_INNERKIT, "write callback failed");
         return;
     }
 
@@ -131,29 +131,29 @@ void CoAuthProxy::BeginSchedule(uint64_t scheduleId, AuthInfo &authInfo, const s
     MessageParcel reply;
 
     if (!data.WriteInterfaceToken(CoAuthProxy::GetDescriptor())) {
-        COAUTH_HILOGE(MODULE_INNERKIT, "write descriptor failed!");
+        COAUTH_HILOGE(MODULE_INNERKIT, "write descriptor failed");
         return;
     }
 
-    std::string GetPkgName;
-    authInfo.GetPkgName(GetPkgName);
-    if (!data.WriteString(GetPkgName)) {
-        COAUTH_HILOGE(MODULE_INNERKIT, "WriteString,GetPkgName failed");
+    std::string pkgName;
+    authInfo.GetPkgName(pkgName);
+    if (!data.WriteString(pkgName)) {
+        COAUTH_HILOGE(MODULE_INNERKIT, "write pkgName failed");
         return;
     }
-    uint64_t GetCallerUid;
-    authInfo.GetCallerUid(GetCallerUid);
-    data.WriteUint64(GetCallerUid);
-    COAUTH_HILOGD(MODULE_INNERKIT, "WriteUint64,GetCallerUid:%{public}" PRIu64, GetCallerUid);
+    uint64_t callerUid;
+    authInfo.GetCallerUid(callerUid);
+    data.WriteUint64(callerUid);
+    COAUTH_HILOGD(MODULE_INNERKIT, "write callerUid: %{public}" PRIu64, GetCallerUid);
 
     if (!data.WriteUint64(scheduleId)) {
-        COAUTH_HILOGE(MODULE_INNERKIT, "failed to WriteUint64(scheduleId).");
+        COAUTH_HILOGE(MODULE_INNERKIT, "write scheduleId failed");
         return;
     }
-    COAUTH_HILOGD(MODULE_INNERKIT, "WriteUint64,scheduleId:%{public}" PRIu64, scheduleId);
+    COAUTH_HILOGD(MODULE_INNERKIT, "write scheduleId: %{public}" PRIu64, scheduleId);
 
     if (!data.WriteRemoteObject(callback->AsObject())) {
-        COAUTH_HILOGE(MODULE_INNERKIT, "failed to WriteRemoteObject(callback).");
+        COAUTH_HILOGE(MODULE_INNERKIT, "write callback failed");
         return;
     }
 
@@ -161,7 +161,7 @@ void CoAuthProxy::BeginSchedule(uint64_t scheduleId, AuthInfo &authInfo, const s
     if (ret) {
         COAUTH_HILOGD(MODULE_INNERKIT, "ret = %{public}d", ret);
     } else {
-        COAUTH_HILOGE(MODULE_INNERKIT, "failed to SendRequest.");
+        COAUTH_HILOGE(MODULE_INNERKIT, "send request failed");
     }
 }
 
@@ -170,23 +170,23 @@ int32_t CoAuthProxy::Cancel(uint64_t scheduleId)
     MessageParcel data;
     COAUTH_HILOGD(MODULE_INNERKIT, "CoauthProxy: Cancel start");
     if (!data.WriteInterfaceToken(CoAuthProxy::GetDescriptor())) {
-        COAUTH_HILOGE(MODULE_INNERKIT, "write descriptor failed!");
+        COAUTH_HILOGE(MODULE_INNERKIT, "write descriptor failed");
         return FAIL;
     }
     if (!data.WriteUint64(scheduleId)) {
-        COAUTH_HILOGE(MODULE_INNERKIT, "failed to WriteUint64(scheduleId).");
+        COAUTH_HILOGE(MODULE_INNERKIT, "write scheduleId failed");
         return FAIL;
     }
 
     MessageParcel reply;
     bool ret = SendRequest(static_cast<int32_t>(ICoAuth::COAUTH_SCHEDULE_CANCEL), data, reply);
     if (!ret) {
-        COAUTH_HILOGE(MODULE_INNERKIT, "SendRequest is failed, error code: %{public}d", ret);
+        COAUTH_HILOGE(MODULE_INNERKIT, "send request failed, error code: %{public}d", ret);
         return FAIL;
     }
     int32_t result = FAIL;
     if (!reply.ReadInt32(result)) {
-        COAUTH_HILOGE(MODULE_INNERKIT, "Read result fail!");
+        COAUTH_HILOGE(MODULE_INNERKIT, "read result failed");
         return FAIL;
     }
     COAUTH_HILOGD(MODULE_INNERKIT, "result = %{public}d", result);
@@ -194,7 +194,7 @@ int32_t CoAuthProxy::Cancel(uint64_t scheduleId)
 }
 
 int32_t CoAuthProxy::GetExecutorProp(AuthResPool::AuthAttributes &conditions,
-                                     std::shared_ptr<AuthResPool::AuthAttributes> values)
+    std::shared_ptr<AuthResPool::AuthAttributes> values)
 {
     COAUTH_HILOGD(MODULE_INNERKIT, "CoauthProxy: GetExecutorProp start");
     int32_t result = SUCCESS;
@@ -202,36 +202,36 @@ int32_t CoAuthProxy::GetExecutorProp(AuthResPool::AuthAttributes &conditions,
     MessageParcel reply;
 
     if (!data.WriteInterfaceToken(CoAuthProxy::GetDescriptor())) {
-        COAUTH_HILOGE(MODULE_INNERKIT, "write descriptor failed!");
+        COAUTH_HILOGE(MODULE_INNERKIT, "write descriptor failed");
         return FAIL;
     }
 
     if (values == nullptr) {
-        COAUTH_HILOGE(MODULE_INNERKIT, "failed to get valuesptr.");
+        COAUTH_HILOGE(MODULE_INNERKIT, "values is nullptr");
         return FAIL;
     }
     std::vector<uint8_t> buffer;
     if (conditions.Pack(buffer)) {
-        COAUTH_HILOGE(MODULE_INNERKIT, "conditions pack buffer failed!");
+        COAUTH_HILOGE(MODULE_INNERKIT, "conditions pack buffer failed");
         return FAIL;
     }
     if (!data.WriteUInt8Vector(buffer)) {
-        COAUTH_HILOGE(MODULE_INNERKIT, "data WriteUInt8Vector buffer failed!");
+        COAUTH_HILOGE(MODULE_INNERKIT, "write buffer failed");
         return FAIL;
     }
 
     std::vector<uint8_t> valuesReply;
     bool ret = SendRequest(static_cast<int32_t>(ICoAuth::COAUTH_GET_PROPERTY), data, reply);
     if (!ret) {
-        COAUTH_HILOGE(MODULE_INNERKIT, "SendRequest is failed, error code: %{public}d", ret);
+        COAUTH_HILOGE(MODULE_INNERKIT, "send request failed, error code: %{public}d", ret);
         return FAIL;
     }
     if (!reply.ReadInt32(result)) {
-        COAUTH_HILOGE(MODULE_INNERKIT, "Readback fail!");
+        COAUTH_HILOGE(MODULE_INNERKIT, "read result failed");
         return FAIL;
     }
     if (!reply.ReadUInt8Vector(&valuesReply)) {
-        COAUTH_HILOGE(MODULE_INNERKIT, "Readback fail!");
+        COAUTH_HILOGE(MODULE_INNERKIT, "read valuesReply failed");
         return FAIL;
     } else {
         values->Unpack(valuesReply);
@@ -240,34 +240,34 @@ int32_t CoAuthProxy::GetExecutorProp(AuthResPool::AuthAttributes &conditions,
 }
 
 void CoAuthProxy::SetExecutorProp(AuthResPool::AuthAttributes &conditions,
-                                  const sptr<ISetPropCallback> &callback)
+    const sptr<ISetPropCallback> &callback)
 {
     COAUTH_HILOGD(MODULE_INNERKIT, "CoauthProxy: SetExecutorProp start");
     MessageParcel data;
     MessageParcel reply;
 
     if (!data.WriteInterfaceToken(CoAuthProxy::GetDescriptor())) {
-        COAUTH_HILOGE(MODULE_INNERKIT, "write descriptor failed!");
+        COAUTH_HILOGE(MODULE_INNERKIT, "write descriptor failed");
         return;
     }
     std::vector<uint8_t> buffer;
     if (conditions.Pack(buffer)) {
-        COAUTH_HILOGE(MODULE_INNERKIT, "conditions pack buffer failed!");
+        COAUTH_HILOGE(MODULE_INNERKIT, "conditions pack buffer failed");
         return;
     }
     if (!data.WriteUInt8Vector(buffer)) {
-        COAUTH_HILOGE(MODULE_INNERKIT, "data WriteUInt8Vector buffer failed!");
+        COAUTH_HILOGE(MODULE_INNERKIT, "data WriteUInt8Vector buffer failed");
         return;
     }
     if (!data.WriteRemoteObject(callback->AsObject())) {
-        COAUTH_HILOGE(MODULE_INNERKIT, "failed to WriteRemoteObject(callback).");
+        COAUTH_HILOGE(MODULE_INNERKIT, "write callback failed");
         return;
     }
     bool ret = SendRequest(static_cast<int32_t>(ICoAuth::COAUTH_SET_PROPERTY), data, reply, false);
     if (ret) {
         COAUTH_HILOGD(MODULE_INNERKIT, "ret = %{public}d", ret);
     } else {
-        COAUTH_HILOGE(MODULE_INNERKIT, "failed to SendRequest.");
+        COAUTH_HILOGE(MODULE_INNERKIT, "send request failed");
     }
 }
 
@@ -276,13 +276,13 @@ bool CoAuthProxy::SendRequest(uint32_t code, MessageParcel &data, MessageParcel
     COAUTH_HILOGD(MODULE_INNERKIT, "CoauthProxy: SendRequest start");
     sptr<IRemoteObject> remote = Remote();
     if (remote == nullptr) {
-        COAUTH_HILOGE(MODULE_INNERKIT, "failed to get remote.");
+        COAUTH_HILOGE(MODULE_INNERKIT, "get remote failed");
         return false;
     }
     MessageOption option(isSync ? MessageOption::TF_SYNC : MessageOption::TF_ASYNC);
     int32_t result = remote->SendRequest(code, data, reply, option);
     if (result != OHOS::NO_ERROR) {
-        COAUTH_HILOGE(MODULE_INNERKIT, "failed to SendRequest.result = %{public}d", result);
+        COAUTH_HILOGE(MODULE_INNERKIT, "send request failed, result = %{public}d", result);
         return false;
     }
     return true;
diff --git a/frameworks/kitsimpl/src/executor_callback_proxy.cpp b/frameworks/kitsimpl/src/executor_callback_proxy.cpp
index 57993c1..670a5ba 100644
--- a/frameworks/kitsimpl/src/executor_callback_proxy.cpp
+++ b/frameworks/kitsimpl/src/executor_callback_proxy.cpp
@@ -22,16 +22,16 @@ namespace UserIAM {
 namespace AuthResPool {
 void ExecutorCallbackProxy::OnMessengerReady(const sptr<IExecutorMessenger> &messenger)
 {
-    COAUTH_HILOGD(MODULE_INNERKIT, "ExecutorCallbackProxy OnMessengerReady!");
+    COAUTH_HILOGD(MODULE_INNERKIT, "ExecutorCallbackProxy OnMessengerReady");
     MessageParcel data;
     MessageParcel reply;
     if (!data.WriteInterfaceToken(ExecutorCallbackProxy::GetDescriptor())) {
-        COAUTH_HILOGE(MODULE_INNERKIT, "write descriptor failed!");
+        COAUTH_HILOGE(MODULE_INNERKIT, "write descriptor failed");
         return;
     }
 
     if (!data.WriteRemoteObject(messenger.GetRefPtr()->AsObject())) {
-        COAUTH_HILOGE(MODULE_INNERKIT, "write RemoteObject failed!");
+        COAUTH_HILOGE(MODULE_INNERKIT, "write RemoteObject failed");
         return;
     }
     bool ret = SendRequest(static_cast<int32_t>(IExecutorCallback::ON_MESSENGER_READY), data, reply);
@@ -39,45 +39,45 @@ void ExecutorCallbackProxy::OnMessengerReady(const sptr<IExecutorMessenger> &mes
 }
 
 int32_t ExecutorCallbackProxy::OnBeginExecute(uint64_t scheduleId, std::vector<uint8_t> &publicKey,
-                                              std::shared_ptr<AuthAttributes> commandAttrs)
+    std::shared_ptr<AuthAttributes> commandAttrs)
 {
     if (commandAttrs == nullptr) {
-        COAUTH_HILOGE(MODULE_INNERKIT, "commandAttrs is null!");
+        COAUTH_HILOGE(MODULE_INNERKIT, "commandAttrs is nullptr");
         return INVALID_PARAMETERS;
     }
     MessageParcel data;
     MessageParcel reply;
     if (!data.WriteInterfaceToken(ExecutorCallbackProxy::GetDescriptor())) {
-        COAUTH_HILOGE(MODULE_INNERKIT, "write descriptor failed!");
+        COAUTH_HILOGE(MODULE_INNERKIT, "write descriptor failed");
         return FAIL;
     }
 
     if (!data.WriteUint64(scheduleId)) {
-        COAUTH_HILOGE(MODULE_INNERKIT, "write scheduleId failed!");
+        COAUTH_HILOGE(MODULE_INNERKIT, "write scheduleId failed");
         return FAIL;
     }
     if (!data.WriteUInt8Vector(publicKey)) {
-        COAUTH_HILOGE(MODULE_INNERKIT, "write publicKey failed!");
+        COAUTH_HILOGE(MODULE_INNERKIT, "write publicKey failed");
         return FAIL;
     }
     std::vector<uint8_t> buffer;
     if (commandAttrs->Pack(buffer) != SUCCESS) {
-        COAUTH_HILOGE(MODULE_INNERKIT, "pack commandAttrs failed!");
+        COAUTH_HILOGE(MODULE_INNERKIT, "pack commandAttrs failed");
         return FAIL;
     }
     if (!data.WriteUInt8Vector(buffer)) {
-        COAUTH_HILOGE(MODULE_INNERKIT, "write buffer failed!");
+        COAUTH_HILOGE(MODULE_INNERKIT, "write buffer failed");
         return FAIL;
     }
 
     bool ret = SendRequest(static_cast<int32_t>(IExecutorCallback::ON_BEGIN_EXECUTE), data, reply);
     if (!ret) {
-        COAUTH_HILOGE(MODULE_INNERKIT, "SendRequest failed!");
+        COAUTH_HILOGE(MODULE_INNERKIT, "send request failed");
         return FAIL;
     }
     int32_t result = FAIL;
     if (!reply.ReadInt32(result)) {
-        COAUTH_HILOGE(MODULE_INNERKIT, "read result failed!");
+        COAUTH_HILOGE(MODULE_INNERKIT, "read result failed");
         return FAIL;
     }
     COAUTH_HILOGI(MODULE_INNERKIT, "result = %{public}d", result);
@@ -93,33 +93,33 @@ int32_t ExecutorCallbackProxy::OnEndExecute(uint64_t scheduleId, std::shared_ptr
     MessageParcel data;
     MessageParcel reply;
     if (!data.WriteInterfaceToken(ExecutorCallbackProxy::GetDescriptor())) {
-        COAUTH_HILOGE(MODULE_INNERKIT, "write descriptor failed!");
+        COAUTH_HILOGE(MODULE_INNERKIT, "write descriptor failed");
         return FAIL;
     }
 
     if (!data.WriteUint64(scheduleId)) {
-        COAUTH_HILOGE(MODULE_INNERKIT, "write scheduleId failed!");
+        COAUTH_HILOGE(MODULE_INNERKIT, "write scheduleId failed");
         return FAIL;
     }
 
     std::vector<uint8_t> buffer;
     if (consumerAttr->Pack(buffer) != SUCCESS) {
-        COAUTH_HILOGE(MODULE_INNERKIT, "pack consumerAttr failed!");
+        COAUTH_HILOGE(MODULE_INNERKIT, "pack consumerAttr failed");
         return FAIL;
     }
     if (!data.WriteUInt8Vector(buffer)) {
-        COAUTH_HILOGE(MODULE_INNERKIT, "write buffer failed!");
+        COAUTH_HILOGE(MODULE_INNERKIT, "write buffer failed");
         return FAIL;
     }
 
     bool ret = SendRequest(static_cast<int32_t>(IExecutorCallback::ON_END_EXECUTE), data, reply);
     if (!ret) {
-        COAUTH_HILOGE(MODULE_INNERKIT, "SendRequest fail");
+        COAUTH_HILOGE(MODULE_INNERKIT, "send request failed");
         return FAIL;
     }
     int32_t result = FAIL;
     if (!reply.ReadInt32(result)) {
-        COAUTH_HILOGE(MODULE_INNERKIT, "read result fail");
+        COAUTH_HILOGE(MODULE_INNERKIT, "read result failed");
         return FAIL;
     }
     COAUTH_HILOGI(MODULE_INNERKIT, "result = %{public}d", result);
@@ -135,26 +135,26 @@ int32_t ExecutorCallbackProxy::OnSetProperty(std::shared_ptr<AuthAttributes> pro
     MessageParcel data;
     MessageParcel reply;
     if (!data.WriteInterfaceToken(ExecutorCallbackProxy::GetDescriptor())) {
-        COAUTH_HILOGE(MODULE_INNERKIT, "write descriptor failed!");
+        COAUTH_HILOGE(MODULE_INNERKIT, "write descriptor failed");
         return FAIL;
     }
     std::vector<uint8_t> buffer;
     if (properties->Pack(buffer)) {
-        COAUTH_HILOGE(MODULE_INNERKIT, "pack properties failed!");
+        COAUTH_HILOGE(MODULE_INNERKIT, "pack properties failed");
         return FAIL;
     }
     if (!data.WriteUInt8Vector(buffer)) {
-        COAUTH_HILOGE(MODULE_INNERKIT, "write buffer failed!");
+        COAUTH_HILOGE(MODULE_INNERKIT, "write buffer failed");
         return FAIL;
     }
     bool ret = SendRequest(static_cast<int32_t>(IExecutorCallback::ON_SET_PROPERTY), data, reply);
     if (!ret) {
-        COAUTH_HILOGE(MODULE_INNERKIT, "SendRequest failed!");
+        COAUTH_HILOGE(MODULE_INNERKIT, "send request failed");
         return FAIL;
     }
     int32_t result = FAIL;
     if (!reply.ReadInt32(result)) {
-        COAUTH_HILOGE(MODULE_INNERKIT, "read result fail");
+        COAUTH_HILOGE(MODULE_INNERKIT, "read result failed");
         return FAIL;
     }
     COAUTH_HILOGI(MODULE_INNERKIT, "result = %{public}d", result);
@@ -162,7 +162,7 @@ int32_t ExecutorCallbackProxy::OnSetProperty(std::shared_ptr<AuthAttributes> pro
 }
 
 int32_t ExecutorCallbackProxy::OnGetProperty(std::shared_ptr<AuthAttributes> conditions,
-                                             std::shared_ptr<AuthAttributes> values)
+    std::shared_ptr<AuthAttributes> values)
 {
     if (conditions == nullptr || values == nullptr) {
         COAUTH_HILOGE(MODULE_INNERKIT, "param is null");
@@ -171,38 +171,38 @@ int32_t ExecutorCallbackProxy::OnGetProperty(std::shared_ptr<AuthAttributes> con
     MessageParcel data;
     MessageParcel reply;
     if (values == nullptr) {
-        COAUTH_HILOGE(MODULE_INNERKIT, "ExecutorCallbackProxy values is null.");
+        COAUTH_HILOGE(MODULE_INNERKIT, "values is null.");
         return FAIL;
     }
 
     if (!data.WriteInterfaceToken(ExecutorCallbackProxy::GetDescriptor())) {
-        COAUTH_HILOGE(MODULE_INNERKIT, "write descriptor failed!");
+        COAUTH_HILOGE(MODULE_INNERKIT, "write descriptor failed");
         return FAIL;
     }
 
     std::vector<uint8_t> buffer;
     if (conditions->Pack(buffer)) {
-        COAUTH_HILOGE(MODULE_INNERKIT, "pack conditions failed!");
+        COAUTH_HILOGE(MODULE_INNERKIT, "pack conditions failed");
         return FAIL;
     }
     if (!data.WriteUInt8Vector(buffer)) {
-        COAUTH_HILOGE(MODULE_INNERKIT, "write buffer failed!");
+        COAUTH_HILOGE(MODULE_INNERKIT, "write buffer failed");
         return FAIL;
     }
 
     std::vector<uint8_t> valuesReply;
     bool ret = SendRequest(static_cast<int32_t>(IExecutorCallback::ON_GET_PROPERTY), data, reply); // must sync
     if (!ret) {
-        COAUTH_HILOGE(MODULE_INNERKIT, "SendRequest failed!");
+        COAUTH_HILOGE(MODULE_INNERKIT, "send request failed");
         return FAIL;
     }
     int32_t result = FAIL;
     if (!reply.ReadInt32(result)) {
-        COAUTH_HILOGE(MODULE_INNERKIT, "read result fail");
+        COAUTH_HILOGE(MODULE_INNERKIT, "read result failed");
         return FAIL;
     }
     if (!reply.ReadUInt8Vector(&valuesReply)) {
-        COAUTH_HILOGE(MODULE_INNERKIT, "Readback fail!");
+        COAUTH_HILOGE(MODULE_INNERKIT, "read valuesReply failed");
         return FAIL;
     } else {
         values->Unpack(valuesReply);
@@ -216,13 +216,13 @@ bool ExecutorCallbackProxy::SendRequest(uint32_t code, MessageParcel &data, Mess
 {
     sptr<IRemoteObject> remote = Remote();
     if (remote == nullptr) {
-        COAUTH_HILOGE(MODULE_INNERKIT, "failed to get remote.");
+        COAUTH_HILOGE(MODULE_INNERKIT, "get remote failed");
         return false;
     }
     MessageOption option(MessageOption::TF_SYNC);
     int32_t result = remote->SendRequest(code, data, reply, option);
     if (result != OHOS::NO_ERROR) {
-        COAUTH_HILOGE(MODULE_INNERKIT, "failed to SendRequest.result = %{public}d", result);
+        COAUTH_HILOGE(MODULE_INNERKIT, "send request failed, result = %{public}d", result);
         return false;
     }
     return true;
diff --git a/frameworks/kitsimpl/src/executor_callback_stub.cpp b/frameworks/kitsimpl/src/executor_callback_stub.cpp
index e097044..29c296e 100644
--- a/frameworks/kitsimpl/src/executor_callback_stub.cpp
+++ b/frameworks/kitsimpl/src/executor_callback_stub.cpp
@@ -28,13 +28,13 @@ ExecutorCallbackStub::ExecutorCallbackStub(const std::shared_ptr<ExecutorCallbac
 }
 
 int32_t ExecutorCallbackStub::OnRemoteRequest(uint32_t code, MessageParcel &data,
-                                              MessageParcel &reply, MessageOption &option)
+    MessageParcel &reply, MessageOption &option)
 {
     COAUTH_HILOGD(MODULE_INNERKIT, "ExecutorCallbackStub::OnRemoteRequest!");
     std::u16string descripter = ExecutorCallbackStub::GetDescriptor();
     std::u16string remoteDescripter = data.ReadInterfaceToken();
     if (descripter != remoteDescripter) {
-        COAUTH_HILOGE(MODULE_INNERKIT, "CoAuthStub::OnRemoteRequest failed, descriptor is not matched!");
+        COAUTH_HILOGE(MODULE_INNERKIT, "descriptor is not matched");
         return FAIL;
     }
 
@@ -62,7 +62,7 @@ int32_t ExecutorCallbackStub::OnMessengerReadyStub(MessageParcel &data, MessageP
         COAUTH_HILOGE(MODULE_INNERKIT, "messenger is nullptr");
         return FAIL;
     }
-    COAUTH_HILOGD(MODULE_INNERKIT, "iface_cast right");
+    COAUTH_HILOGD(MODULE_INNERKIT, "iface_cast is right");
     OnMessengerReady(messenger);
     COAUTH_HILOGD(MODULE_INNERKIT, "OnMessengerReady GetRefPtr");
     return SUCCESS;
@@ -78,7 +78,7 @@ int32_t ExecutorCallbackStub::OnBeginExecuteStub(MessageParcel &data, MessagePar
     commandAttrs->Unpack(buffer);
     int32_t ret = OnBeginExecute(scheduleId, publicKey, commandAttrs);
     if (!reply.WriteInt32(ret)) {
-        COAUTH_HILOGE(MODULE_INNERKIT, "failed to WriteInt32(ret)");
+        COAUTH_HILOGE(MODULE_INNERKIT, "write ret failed");
         return FAIL;
     }
     return SUCCESS;
@@ -97,7 +97,7 @@ int32_t ExecutorCallbackStub::OnEndExecuteStub(MessageParcel &data, MessageParce
     consumerAttr->Unpack(buffer);
     int32_t ret = OnEndExecute(scheduleId, consumerAttr);
     if (!reply.WriteInt32(ret)) {
-        COAUTH_HILOGE(MODULE_INNERKIT, "failed to WriteInt32(ret)");
+        COAUTH_HILOGE(MODULE_INNERKIT, "write ret failed");
         return FAIL;
     }
     return SUCCESS;
@@ -113,14 +113,14 @@ int32_t ExecutorCallbackStub::OnGetPropertyStub(MessageParcel &data, MessageParc
     std::shared_ptr<AuthAttributes> values = std::make_shared<AuthAttributes>();
     int32_t ret = OnGetProperty(conditions, values);
     if (!reply.WriteInt32(ret)) {
-        COAUTH_HILOGE(MODULE_INNERKIT, "failed to WriteInt32(ret)");
+        COAUTH_HILOGE(MODULE_INNERKIT, "write ret failed");
         return FAIL;
     }
 
     std::vector<uint8_t> replyBuffer;
     values->Pack(replyBuffer);
     if (!reply.WriteUInt8Vector(replyBuffer)) {
-        COAUTH_HILOGE(MODULE_SERVICE, "failed to replyBuffer");
+        COAUTH_HILOGE(MODULE_SERVICE, "write replyBuffer failed");
         return FAIL;
     }
     return SUCCESS;
@@ -135,7 +135,7 @@ int32_t ExecutorCallbackStub::OnSetPropertyStub(MessageParcel &data, MessageParc
 
     int32_t ret = OnSetProperty(properties);
     if (!reply.WriteInt32(ret)) {
-        COAUTH_HILOGE(MODULE_INNERKIT, "failed to WriteInt32(ret)");
+        COAUTH_HILOGE(MODULE_INNERKIT, "write ret failed");
         return FAIL;
     }
     return SUCCESS;
@@ -151,7 +151,7 @@ void ExecutorCallbackStub::OnMessengerReady(const sptr<IExecutorMessenger> &mess
 }
 
 int32_t ExecutorCallbackStub::OnBeginExecute(uint64_t scheduleId, std::vector<uint8_t> &publicKey,
-                                             std::shared_ptr<AuthAttributes> commandAttrs)
+    std::shared_ptr<AuthAttributes> commandAttrs)
 {
     int32_t ret = FAIL;
     if (callback_ == nullptr) {
@@ -185,7 +185,7 @@ int32_t ExecutorCallbackStub::OnSetProperty(std::shared_ptr<AuthAttributes> prop
 }
 
 int32_t ExecutorCallbackStub::OnGetProperty(std::shared_ptr<AuthAttributes> conditions,
-                                            std::shared_ptr<AuthAttributes> values)
+    std::shared_ptr<AuthAttributes> values)
 {
     int32_t ret = FAIL;
     if (callback_ == nullptr) {
diff --git a/frameworks/kitsimpl/src/executor_messenger_proxy.cpp b/frameworks/kitsimpl/src/executor_messenger_proxy.cpp
index d555657..1dcf2f4 100644
--- a/frameworks/kitsimpl/src/executor_messenger_proxy.cpp
+++ b/frameworks/kitsimpl/src/executor_messenger_proxy.cpp
@@ -21,17 +21,17 @@ namespace OHOS {
 namespace UserIAM {
 namespace AuthResPool {
 int32_t ExecutorMessengerProxy::SendData(uint64_t scheduleId, uint64_t transNum,
-                                         int32_t srcType, int32_t dstType, std::shared_ptr<AuthMessage> msg)
+    int32_t srcType, int32_t dstType, std::shared_ptr<AuthMessage> msg)
 {
     if (msg == nullptr) {
-        COAUTH_HILOGE(MODULE_INNERKIT, "AuthMessage is null!");
+        COAUTH_HILOGE(MODULE_INNERKIT, "msg is nullptr");
         return INVALID_PARAMETERS;
     }
     MessageParcel data;
     MessageParcel reply;
     int32_t result = 0;
     if (!data.WriteInterfaceToken(ExecutorMessengerProxy::GetDescriptor())) {
-        COAUTH_HILOGE(MODULE_INNERKIT, "write descriptor failed!");
+        COAUTH_HILOGE(MODULE_INNERKIT, "write descriptor failed");
         return FAIL;
     }
     if (!data.WriteUint64(scheduleId)) {
@@ -62,16 +62,16 @@ int32_t ExecutorMessengerProxy::SendData(uint64_t scheduleId, uint64_t transNum,
 
 
 int32_t ExecutorMessengerProxy::Finish(uint64_t scheduleId, int32_t srcType, int32_t resultCode,
-                                       std::shared_ptr<AuthAttributes> finalResult)
+    std::shared_ptr<AuthAttributes> finalResult)
 {
     if (finalResult == nullptr) {
-        COAUTH_HILOGE(MODULE_INNERKIT, "finalResult is null!");
+        COAUTH_HILOGE(MODULE_INNERKIT, "finalResult is nullptr");
         return INVALID_PARAMETERS;
     }
     MessageParcel data;
     MessageParcel reply;
     if (!data.WriteInterfaceToken(ExecutorMessengerProxy::GetDescriptor())) {
-        COAUTH_HILOGE(MODULE_INNERKIT, "write descriptor failed!");
+        COAUTH_HILOGE(MODULE_INNERKIT, "write descriptor failed");
         return FAIL;
     }
     if (!data.WriteUint64(scheduleId)) {
@@ -98,17 +98,18 @@ int32_t ExecutorMessengerProxy::Finish(uint64_t scheduleId, int32_t srcType, int
     }
     return result;
 }
+
 bool ExecutorMessengerProxy::SendRequest(uint32_t code, MessageParcel &data, MessageParcel &reply)
 {
     sptr<IRemoteObject> remote = Remote();
     if (remote == nullptr) {
-        COAUTH_HILOGE(MODULE_INNERKIT, "failed to get remote.");
+        COAUTH_HILOGE(MODULE_INNERKIT, "get remote failed");
         return false;
     }
     MessageOption option(MessageOption::TF_SYNC);
     int32_t result = remote->SendRequest(code, data, reply, option);
     if (result != OHOS::NO_ERROR) {
-        COAUTH_HILOGE(MODULE_INNERKIT, "failed to SendRequest.result = %{public}d", result);
+        COAUTH_HILOGE(MODULE_INNERKIT, "send request failed, result = %{public}d", result);
         return false;
     }
     return true;
diff --git a/frameworks/kitsimpl/src/executor_messenger_stub.cpp b/frameworks/kitsimpl/src/executor_messenger_stub.cpp
index 76b8b32..08331c1 100644
--- a/frameworks/kitsimpl/src/executor_messenger_stub.cpp
+++ b/frameworks/kitsimpl/src/executor_messenger_stub.cpp
@@ -22,14 +22,13 @@ const std::string PERMISSION_AUTH_RESPOOL = "ohos.permission.ACCESS_AUTH_RESPOOL
 const std::string PERMISSION_ACCESS_COAUTH = "ohos.permission.ACCESS_COAUTH";
 
 int32_t ExecutorMessengerStub::OnRemoteRequest(uint32_t code, MessageParcel &data,
-                                               MessageParcel &reply, MessageOption &option)
+    MessageParcel &reply, MessageOption &option)
 {
-    COAUTH_HILOGD(MODULE_SERVICE, "CoAuthStub::OnRemoteRequest, cmd = %{public}u, flags= %{public}d",
-                  code, option.GetFlags());
+    COAUTH_HILOGD(MODULE_SERVICE, "cmd = %{public}u, flags= %{public}d", code, option.GetFlags());
     std::u16string descripter = ExecutorMessengerStub::GetDescriptor();
     std::u16string remoteDescripter = data.ReadInterfaceToken();
     if (descripter != remoteDescripter) {
-        COAUTH_HILOGE(MODULE_SERVICE, "CoAuthStub::OnRemoteRequest failed, descriptor is not matched!");
+        COAUTH_HILOGE(MODULE_SERVICE, "descriptor is not matched");
         return FAIL;
     }
 
@@ -42,6 +41,7 @@ int32_t ExecutorMessengerStub::OnRemoteRequest(uint32_t code, MessageParcel &dat
             return IPCObjectStub::OnRemoteRequest(code, data, reply, option);
     }
 }
+
 int32_t ExecutorMessengerStub::SendDataStub(MessageParcel& data, MessageParcel& reply)
 {
     uint64_t scheduleId = data.ReadUint64();
@@ -53,7 +53,7 @@ int32_t ExecutorMessengerStub::SendDataStub(MessageParcel& data, MessageParcel&
     std::shared_ptr<AuthMessage> msg = std::make_shared<AuthMessage>(buffer);
     int32_t ret = SendData(scheduleId, transNum, srcType, dstType, msg); // Call business function
     if (!reply.WriteInt32(ret)) {
-        COAUTH_HILOGE(MODULE_INNERKIT, "failed to WriteInt32(ret)");
+        COAUTH_HILOGE(MODULE_INNERKIT, "write ret failed");
         return FAIL;
     }
     return SUCCESS;
@@ -72,7 +72,7 @@ int32_t ExecutorMessengerStub::FinishStub(MessageParcel& data, MessageParcel& re
 
     int32_t ret = Finish(scheduleId, srcType, resultCode, finalResult);
     if (!reply.WriteInt32(ret)) {
-        COAUTH_HILOGE(MODULE_INNERKIT, "failed to WriteInt32(ret)");
+        COAUTH_HILOGE(MODULE_INNERKIT, "write ret failed");
         return FAIL;
     }
     return SUCCESS;
diff --git a/frameworks/kitsimpl/src/query_callback_proxy.cpp b/frameworks/kitsimpl/src/query_callback_proxy.cpp
index c99c9f3..df2944a 100644
--- a/frameworks/kitsimpl/src/query_callback_proxy.cpp
+++ b/frameworks/kitsimpl/src/query_callback_proxy.cpp
@@ -25,11 +25,11 @@ void QueryCallbackProxy::OnResult(uint32_t resultCode)
 {
     MessageParcel data;
     if (!data.WriteInterfaceToken(QueryCallbackProxy::GetDescriptor())) {
-        COAUTH_HILOGE(MODULE_INNERKIT, "write descriptor failed!");
+        COAUTH_HILOGE(MODULE_INNERKIT, "write descriptor failed");
         return;
     }
     if (!data.WriteUint32(resultCode)) {
-        COAUTH_HILOGE(MODULE_INNERKIT, "failed to WriteUint64(scheduleId).");
+        COAUTH_HILOGE(MODULE_INNERKIT, "write resultCode failed");
         return;
     }
     MessageParcel reply;
@@ -43,13 +43,13 @@ bool QueryCallbackProxy::SendRequest(uint32_t code, MessageParcel &data, Message
 {
     sptr<IRemoteObject> remote = Remote();
     if (remote == nullptr) {
-        COAUTH_HILOGE(MODULE_INNERKIT, "failed to get remote.");
+        COAUTH_HILOGE(MODULE_INNERKIT, "get remote failed");
         return false;
     }
     MessageOption option(MessageOption::TF_SYNC);
     int32_t result = remote->SendRequest(code, data, reply, option);
     if (result != OHOS::NO_ERROR) {
-        COAUTH_HILOGE(MODULE_INNERKIT, "failed to SendRequest.result = %{public}d", result);
+        COAUTH_HILOGE(MODULE_INNERKIT, "send request failed, result = %{public}d", result);
         return false;
     }
     return true;
diff --git a/frameworks/kitsimpl/src/query_callback_stub.cpp b/frameworks/kitsimpl/src/query_callback_stub.cpp
index 33251a1..9787387 100644
--- a/frameworks/kitsimpl/src/query_callback_stub.cpp
+++ b/frameworks/kitsimpl/src/query_callback_stub.cpp
@@ -27,12 +27,12 @@ QueryCallbackStub::QueryCallbackStub(const std::shared_ptr<QueryCallback>& impl)
 }
 
 int32_t QueryCallbackStub::OnRemoteRequest(uint32_t code, MessageParcel &data,
-                                           MessageParcel &reply, MessageOption &option)
+    MessageParcel &reply, MessageOption &option)
 {
     std::u16string descripter = QueryCallbackStub::GetDescriptor();
     std::u16string remoteDescripter = data.ReadInterfaceToken();
     if (descripter != remoteDescripter) {
-        COAUTH_HILOGD(MODULE_INNERKIT, "CoAuthStub::OnRemoteRequest failed, descriptor is not matched!");
+        COAUTH_HILOGD(MODULE_INNERKIT, "descriptor is not matched");
         return FAIL;
     }
     switch (code) {
diff --git a/frameworks/kitsimpl/src/set_prop_callback_proxy.cpp b/frameworks/kitsimpl/src/set_prop_callback_proxy.cpp
index 7679577..0705a2d 100644
--- a/frameworks/kitsimpl/src/set_prop_callback_proxy.cpp
+++ b/frameworks/kitsimpl/src/set_prop_callback_proxy.cpp
@@ -26,22 +26,22 @@ void SetPropCallbackProxy::OnResult(uint32_t result, std::vector<uint8_t> &extra
     MessageParcel data;
     MessageParcel reply;
     if (!data.WriteInterfaceToken(SetPropCallbackProxy::GetDescriptor())) {
-        COAUTH_HILOGE(MODULE_INNERKIT, "write descriptor failed!");
+        COAUTH_HILOGE(MODULE_INNERKIT, "write descriptor failed");
         return;
     }
     if (!data.WriteUint32(result)) {
-        COAUTH_HILOGE(MODULE_INNERKIT, "failed to WriteUint32(result).");
+        COAUTH_HILOGE(MODULE_INNERKIT, "write result failed");
         return;
     }
 
     if (!data.WriteUInt8Vector(extraInfo)) {
-        COAUTH_HILOGE(MODULE_INNERKIT, "fail to write WriteUInt8Vector extraInfo");
+        COAUTH_HILOGE(MODULE_INNERKIT, "write extraInfo failed");
         return;
     }
 
     bool ret = SendRequest(static_cast<int32_t>(ISetPropCallback::ONRESULT), data, reply);
     if (!ret) {
-        COAUTH_HILOGE(MODULE_INNERKIT, "SendRequest is failed, error code: %{public}d", ret);
+        COAUTH_HILOGE(MODULE_INNERKIT, "send request failed, error code: %{public}d", ret);
     }
 }
 
@@ -49,13 +49,13 @@ bool SetPropCallbackProxy::SendRequest(uint32_t code, MessageParcel &data, Messa
 {
     sptr<IRemoteObject> remote = Remote();
     if (remote == nullptr) {
-        COAUTH_HILOGE(MODULE_INNERKIT, "failed to get remote.");
+        COAUTH_HILOGE(MODULE_INNERKIT, "get remote failed");
         return false;
     }
     MessageOption option(MessageOption::TF_SYNC);
     int32_t result = remote->SendRequest(code, data, reply, option);
     if (result != OHOS::NO_ERROR) {
-        COAUTH_HILOGE(MODULE_INNERKIT, "failed to SendRequest.result = %{public}d", result);
+        COAUTH_HILOGE(MODULE_INNERKIT, "send request failed, result = %{public}d", result);
         return false;
     }
     return true;
diff --git a/frameworks/kitsimpl/src/set_prop_callback_stub.cpp b/frameworks/kitsimpl/src/set_prop_callback_stub.cpp
index 33a02da..5d158d5 100644
--- a/frameworks/kitsimpl/src/set_prop_callback_stub.cpp
+++ b/frameworks/kitsimpl/src/set_prop_callback_stub.cpp
@@ -25,13 +25,13 @@ SetPropCallbackStub::SetPropCallbackStub(const std::shared_ptr<SetPropCallback>&
     callback_ = impl;
 }
 
-int32_t SetPropCallbackStub::OnRemoteRequest(uint32_t code, MessageParcel &data,
-                                             MessageParcel &reply, MessageOption &option)
+int32_t SetPropCallbackStub::OnRemoteRequest(uint32_t code, MessageParcel &data, MessageParcel &reply,
+    MessageOption &option)
 {
     std::u16string descripter = SetPropCallbackStub::GetDescriptor();
     std::u16string remoteDescripter = data.ReadInterfaceToken();
     if (descripter != remoteDescripter) {
-        COAUTH_HILOGD(MODULE_INNERKIT, "CoAuthStub::OnRemoteRequest failed, descriptor is not matched!");
+        COAUTH_HILOGD(MODULE_INNERKIT, "descriptor is not matched");
         return FAIL;
     }
     switch (code) {
diff --git a/interfaces/innerkits/src/auth_attributes.cpp b/interfaces/innerkits/src/auth_attributes.cpp
index a804f32..d16a702 100644
--- a/interfaces/innerkits/src/auth_attributes.cpp
+++ b/interfaces/innerkits/src/auth_attributes.cpp
@@ -395,7 +395,7 @@ int32_t AuthAttributes::Pack(std::vector<uint8_t> &buffer)
 
 
 void AuthAttributes::Write32Array(std::vector<uint32_t> &uint32ArraylValue, uint8_t *writePointer,
-                                  std::vector<uint8_t> &buffer)
+    std::vector<uint8_t> &buffer)
 {
     for (std::size_t num = 0; num < uint32ArraylValue.size(); num++) {
         writePointer = static_cast<uint8_t*>(static_cast<void *>(&uint32ArraylValue[num]));
@@ -403,7 +403,7 @@ void AuthAttributes::Write32Array(std::vector<uint32_t> &uint32ArraylValue, uint
     }
 }
 void AuthAttributes::Write64Array(std::vector<uint64_t> &uint64ArraylValue, uint8_t *writePointer,
-                                  std::vector<uint8_t> &buffer)
+    std::vector<uint8_t> &buffer)
 {
     for (std::size_t num = 0; num < uint64ArraylValue.size(); num++) {
         writePointer = static_cast<uint8_t*>(static_cast<void *>(&uint64ArraylValue[num]));
@@ -411,9 +411,8 @@ void AuthAttributes::Write64Array(std::vector<uint64_t> &uint64ArraylValue, uint
     }
 }
 
-void  AuthAttributes::PackToBuffer(std::map<AuthAttributeType, ValueType>::iterator iter,
-                                   uint32_t dataLength, uint8_t *writePointer,
-                                   std::vector<uint8_t> &buffer)
+void AuthAttributes::PackToBuffer(std::map<AuthAttributeType, ValueType>::iterator iter,
+    uint32_t dataLength, uint8_t *writePointer, std::vector<uint8_t> &buffer)
 {
     bool boolValue;
     uint32_t uint32Value;
diff --git a/interfaces/innerkits/src/auth_executor.cpp b/interfaces/innerkits/src/auth_executor.cpp
index f8141d9..34a6d54 100644
--- a/interfaces/innerkits/src/auth_executor.cpp
+++ b/interfaces/innerkits/src/auth_executor.cpp
@@ -37,6 +37,7 @@ int32_t AuthExecutor::GetAuthType(AuthType &value)
     value = authTypeValue_;
     return 0;
 }
+
 int32_t AuthExecutor::SetAuthType(AuthType value)
 {
     authTypeValue_ = value;
@@ -48,6 +49,7 @@ int32_t AuthExecutor::GetAuthAbility(uint64_t &value)
     value = authAbilityValue_;
     return 0;
 }
+
 int32_t AuthExecutor::SetAuthAbility(uint64_t value)
 {
     authAbilityValue_ = value;
@@ -59,6 +61,7 @@ int32_t AuthExecutor::GetExecutorSecLevel(ExecutorSecureLevel &value)
     value = executorSecLevelValue_;
     return 0;
 }
+
 int32_t AuthExecutor::SetExecutorSecLevel(ExecutorSecureLevel value)
 {
     executorSecLevelValue_ = value;
@@ -70,6 +73,7 @@ int32_t AuthExecutor::GetExecutorType(ExecutorType &value)
     value = executorTypeValue_;
     return 0;
 }
+
 int32_t AuthExecutor::SetExecutorType(ExecutorType value)
 {
     executorTypeValue_ = value;
@@ -81,6 +85,7 @@ int32_t AuthExecutor::GetPublicKey(std::vector<uint8_t> &value)
     value = publicKeyValue_;
     return 0;
 }
+
 int32_t AuthExecutor::SetPublicKey(std::vector<uint8_t> &value)
 {
     publicKeyValue_ = value;
@@ -92,6 +97,7 @@ int32_t AuthExecutor::GetDeviceId(std::vector<uint8_t> &value)
     value = deviceIdValue_;
     return 0;
 }
+
 int32_t AuthExecutor::SetDeviceId(std::vector<uint8_t> &value)
 {
     deviceIdValue_ = value;
diff --git a/sa_profile/useriam.rc b/sa_profile/useriam.rc
index 6410e2e..293c645 100644
--- a/sa_profile/useriam.rc
+++ b/sa_profile/useriam.rc
@@ -1,3 +1,16 @@
+# Copyright (c) 2022 Huawei Device Co., Ltd.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 service useriam /system/bin/sa_main /system/profile/useriam.xml
     class z_core
     user system
diff --git a/services/src/auth_res_manager.cpp b/services/src/auth_res_manager.cpp
index 864bf95..4c9f70b 100644
--- a/services/src/auth_res_manager.cpp
+++ b/services/src/auth_res_manager.cpp
@@ -56,16 +56,16 @@ uint64_t AuthResManager::Register(std::shared_ptr<ResAuthExecutor> executorInfo,
     }
     sptr<IRemoteObject::DeathRecipient> dr = new ResIExecutorCallbackDeathRecipient(executorId, this);
     if (!callback->AsObject()->AddDeathRecipient(dr)) {
-        COAUTH_HILOGE(MODULE_SERVICE, "Failed to add death recipient ResIExecutorCallbackDeathRecipient");
+        COAUTH_HILOGE(MODULE_SERVICE, "failed to add death recipient ResIExecutorCallbackDeathRecipient");
         return INVALID_EXECUTOR_ID;
     }
     coAuthResPool_.Insert(executorId, executorInfo, callback);
-    COAUTH_HILOGI(MODULE_SERVICE, "register is successfull!");
+
     // Assign messenger
     sptr<UserIAM::AuthResPool::IExecutorMessenger> messenger =
         new UserIAM::AuthResPool::ExecutorMessenger(&coAuthResPool_);
     callback->OnMessengerReady(messenger);
-    COAUTH_HILOGD(MODULE_SERVICE, "register is successfull,exeID is XXXX%{public}04" PRIx64, executorId);
+    COAUTH_HILOGD(MODULE_SERVICE, "register is successfull, exeID is XXXX%{public}04" PRIx64, executorId);
     return executorId;
 }
 
@@ -81,15 +81,15 @@ void AuthResManager::QueryStatus(ResAuthExecutor &executorInfo, sptr<ResIQueryCa
     }
     result = executorInfo.GetAuthType(authType);
     if (result == SUCCESS) {
-        COAUTH_HILOGI(MODULE_SERVICE, "GetAuthType is success");
+        COAUTH_HILOGI(MODULE_SERVICE, "get AuthType success");
         isExist = IsExecutorExist(authType); // call TA
     } else {
-        COAUTH_HILOGE(MODULE_SERVICE, "GetAuthType is failure");
+        COAUTH_HILOGE(MODULE_SERVICE, "get AuthType failed");
     }
     if (isExist == false) {
-        COAUTH_HILOGE(MODULE_SERVICE, "query status executor register is not exist!");
+        COAUTH_HILOGE(MODULE_SERVICE, "query status executor register is not exist");
     } else {
-        COAUTH_HILOGI(MODULE_SERVICE, "query status executor register is exist!");
+        COAUTH_HILOGI(MODULE_SERVICE, "query status executor register is exist");
     }
     callback->OnResult(isExist ? SUCCESS : FAIL);
 }
@@ -144,9 +144,9 @@ void AuthResManager::ResIExecutorCallbackDeathRecipient::OnRemoteDied(const wptr
 
     int32_t ret = ExecutorUnRegister(executorID_);
     if (ret != SUCCESS) {
-        COAUTH_HILOGE(MODULE_SERVICE, "executor unregister fail.");
+        COAUTH_HILOGE(MODULE_SERVICE, "executor unregister failed");
     }
-    COAUTH_HILOGW(MODULE_SERVICE, "ResIExecutorCallbackDeathRecipient::Recv death notice.");
+    COAUTH_HILOGW(MODULE_SERVICE, "ResIExecutorCallbackDeathRecipient::Recv death notice");
 }
 } // namespace CoAuth
 } // namespace UserIAM
diff --git a/services/src/coauth_manager.cpp b/services/src/coauth_manager.cpp
index eb44cee..f9506e6 100644
--- a/services/src/coauth_manager.cpp
+++ b/services/src/coauth_manager.cpp
@@ -29,7 +29,7 @@ void CoAuthManager::BeginSchedule(uint64_t scheduleId, AuthInfo &authInfo, sptr<
 void CoAuthManager::CoAuthHandle(uint64_t scheduleId, AuthInfo &authInfo, sptr<ICoAuthCallback> callback)
 {
     if (callback == nullptr) {
-        COAUTH_HILOGE(MODULE_SERVICE, "Schedule callback is null.");
+        COAUTH_HILOGE(MODULE_SERVICE, "schedule callback is null");
         return;
     }
     int32_t executeRet = SUCCESS;
@@ -37,30 +37,33 @@ void CoAuthManager::CoAuthHandle(uint64_t scheduleId, AuthInfo &authInfo, sptr<I
     std::vector<uint8_t> scheduleToken;
     int32_t ret = GetScheduleInfo(scheduleId, scheduleInfo);
     if (ret != SUCCESS) {
-        COAUTH_HILOGE(MODULE_SERVICE, "Schedule failed.");
+        COAUTH_HILOGE(MODULE_SERVICE, "get schedule info failed");
         return callback->OnFinish(ret, scheduleToken);
     }
     std::size_t executorNum = scheduleInfo.executors.size();
     if (executorNum == 0) {
-        COAUTH_HILOGE(MODULE_SERVICE, "executorId does not exist.");
+        COAUTH_HILOGE(MODULE_SERVICE, "executorId does not exist");
         return callback->OnFinish(FAIL, scheduleToken);
     }
     sptr<IRemoteObject::DeathRecipient> dr = new ResICoAuthCallbackDeathRecipient(scheduleId, this);
     if ((!callback->AsObject()->AddDeathRecipient(dr))) {
-        COAUTH_HILOGE(MODULE_SERVICE, "Failed to add death recipient ResICoAuthCallbackDeathRecipient");
+        COAUTH_HILOGE(MODULE_SERVICE, "add death recipient ResICoAuthCallbackDeathRecipient failed");
+    }
+    if (coAuthResMgrPtr_ == nullptr) {
+        COAUTH_HILOGE(MODULE_SERVICE, "coAuthResMgrPtr_ is nullptr");
+        return callback->OnFinish(FAIL, scheduleToken);
     }
     int32_t saveRet = coAuthResMgrPtr_->SaveScheduleCallback(scheduleId, executorNum, callback);
     if (saveRet != SUCCESS) {
-        COAUTH_HILOGW(MODULE_SERVICE, "Save schedule callback error.");
+        COAUTH_HILOGW(MODULE_SERVICE, "save schedule callback failed");
         return callback->OnFinish(saveRet, scheduleToken);
     }
     OHOS::AppExecFwk::InnerEvent::Callback task = std::bind(&CoAuthManager::TimeOut, this, scheduleId);
-    COAUTH_HILOGD(MODULE_SERVICE, "CoAuthManager::Excute MonitorCall");
     CallMonitor::GetInstance().MonitorCall(delay_time, scheduleId, task);
     BeginExecute(scheduleInfo, executorNum, scheduleId, authInfo, executeRet);
 
     if (executeRet != SUCCESS) {
-        COAUTH_HILOGW(MODULE_SERVICE, "There are one or more failures in execution.");
+        COAUTH_HILOGW(MODULE_SERVICE, "there are one or more failures in execution");
         callback->OnFinish(executeRet, scheduleToken);
         coAuthResMgrPtr_->DeleteScheduleCallback(scheduleId);
         CallMonitor::GetInstance().MonitorRemoveCall(scheduleId);
@@ -79,7 +82,7 @@ void CoAuthManager::BeginExecute(ScheduleInfo &scheduleInfo, std::size_t executo
                                        scheduleInfo.executors[i].publicKey + PUBLIC_KEY_LEN);
         int32_t findRet = coAuthResMgrPtr_->FindExecutorCallback(authType, executorCallback);
         if ((findRet != SUCCESS) || (executorCallback == nullptr)) {
-            COAUTH_HILOGE(MODULE_SERVICE, "executor callback not found.");
+            COAUTH_HILOGE(MODULE_SERVICE, "executor callback not found");
             continue;
         }
         auto commandAttrs = std::make_shared<ResAuthAttributes>();
@@ -120,13 +123,13 @@ int32_t CoAuthManager::Cancel(uint64_t scheduleId)
     sptr<ResIExecutorCallback> callback = nullptr;
     int32_t getRet = GetScheduleInfo(scheduleId, scheduleInfo); // call TA
     if (getRet != SUCCESS) {
-        COAUTH_HILOGE(MODULE_SERVICE, "cancel is failure");
+        COAUTH_HILOGE(MODULE_SERVICE, "get shedule info filed");
         return FAIL;
     }
     COAUTH_HILOGI(MODULE_SERVICE, "cancel is successfull");
     std::size_t executorNum = scheduleInfo.executors.size();
     if (executorNum == 0) {
-        COAUTH_HILOGE(MODULE_SERVICE, "executorId does not exist.");
+        COAUTH_HILOGE(MODULE_SERVICE, "executorId does not exist");
         return FAIL;
     }
     for (std::size_t i = 0; i < executorNum; i++) {
@@ -135,7 +138,7 @@ int32_t CoAuthManager::Cancel(uint64_t scheduleId)
         COAUTH_HILOGD(MODULE_SERVICE, "get exeID = %{public}u", authType);
         int32_t onceRet = coAuthResMgrPtr_->FindExecutorCallback(authType, executorCallback);
         if ((onceRet != 0) || (executorCallback == nullptr)) {
-            COAUTH_HILOGE(MODULE_SERVICE, "executor callback not found.");
+            COAUTH_HILOGE(MODULE_SERVICE, "executor callback not found");
             continue;
         }
         auto commandAttrs = std::make_shared<ResAuthAttributes>();
@@ -149,12 +152,12 @@ int32_t CoAuthManager::Cancel(uint64_t scheduleId)
         }
     }
     if (executeRet != SUCCESS) {
-        COAUTH_HILOGW(MODULE_SERVICE, "There are one or more failures when canceling.");
+        COAUTH_HILOGW(MODULE_SERVICE, "there are one or more failures when canceling");
         return executeRet;
     }
     int32_t deleteRet = DeleteScheduleInfo(scheduleId, scheduleInfo); // call TA
     if (deleteRet != SUCCESS) {
-        COAUTH_HILOGW(MODULE_SERVICE, "Delete schedule info failed. ret = %{public}d", deleteRet);
+        COAUTH_HILOGW(MODULE_SERVICE, "delete schedule info failed, ret = %{public}d", deleteRet);
     }
     return executeRet;
 }
@@ -180,7 +183,7 @@ void CoAuthManager::SetExecutorProp(ResAuthAttributes &conditions, sptr<ISetProp
     COAUTH_HILOGD(MODULE_SERVICE, "get authType = XXXX%{public}u", authType);
     coAuthResMgrPtr_->FindExecutorCallback(authType, execallback);
     if (execallback == nullptr) {
-        COAUTH_HILOGE(MODULE_SERVICE, "executor callback not found.");
+        COAUTH_HILOGE(MODULE_SERVICE, "executor callback not found");
         return callback->OnResult(result, extraInfo);
     }
     std::vector<uint8_t> buffer;
@@ -189,7 +192,7 @@ void CoAuthManager::SetExecutorProp(ResAuthAttributes &conditions, sptr<ISetProp
     properties->Unpack(buffer);
     result = static_cast<uint32_t>(execallback->OnSetProperty(properties));
     if (result != SUCCESS) {
-        COAUTH_HILOGE(MODULE_SERVICE, "set properties failure");
+        COAUTH_HILOGE(MODULE_SERVICE, "set properties failed");
     }
     callback->OnResult(result, extraInfo);
 }
@@ -203,20 +206,20 @@ int32_t CoAuthManager::GetExecutorProp(ResAuthAttributes &conditions, std::share
     COAUTH_HILOGD(MODULE_SERVICE, "authType is %{public}u", authType);
     coAuthResMgrPtr_->FindExecutorCallback(authType, execallback);
     if (execallback == nullptr) {
-        COAUTH_HILOGE(MODULE_SERVICE, "executor callback not found.");
+        COAUTH_HILOGE(MODULE_SERVICE, "executor callback not found");
         return FAIL;
     }
     std::vector<uint8_t> buffer;
     std::shared_ptr<ResAuthAttributes> properties = std::make_shared<ResAuthAttributes>();
     if (properties == nullptr) {
-        COAUTH_HILOGE(MODULE_SERVICE, "properties is null.");
+        COAUTH_HILOGE(MODULE_SERVICE, "properties is nullptr");
         return FAIL;
     }
     conditions.Pack(buffer);
     properties->Unpack(buffer);
     retCode = execallback->OnGetProperty(properties, values);
     if (retCode != SUCCESS) {
-        COAUTH_HILOGE(MODULE_SERVICE, "get properties failure");
+        COAUTH_HILOGE(MODULE_SERVICE, "get properties failed");
     }
     COAUTH_HILOGI(MODULE_SERVICE, "get properties end");
     return retCode;
@@ -235,29 +238,33 @@ CoAuthManager::ResICoAuthCallbackDeathRecipient::ResICoAuthCallbackDeathRecipien
 void CoAuthManager::ResICoAuthCallbackDeathRecipient::OnRemoteDied(const wptr<IRemoteObject>& remote)
 {
     if (remote == nullptr) {
-        COAUTH_HILOGE(MODULE_SERVICE, "CoAuthCallback OnRemoteDied failed, remote is nullptr");
+        COAUTH_HILOGE(MODULE_SERVICE, "remote is nullptr");
         return;
     }
-
-    if (parent_ != nullptr) {
-        parent_->coAuthResMgrPtr_->DeleteScheduleCallback(scheduleId);
+    if (parent_ == nullptr || parent_->coAuthResMgrPtr_) {
+        COAUTH_HILOGE(MODULE_SERVICE, "parent or parent coAuthResMgrPtr_ is nullptr");
+        return;
     }
-    COAUTH_HILOGW(MODULE_SERVICE, "ResICoAuthCallbackDeathRecipient::Recv death notice.");
+    parent_->coAuthResMgrPtr_->DeleteScheduleCallback(scheduleId); 
 }
 
 void CoAuthManager::TimeOut(uint64_t scheduleId)
 {
     sptr<UserIAM::CoAuth::ICoAuthCallback> callback;
+    if (coAuthResMgrPtr_ == nullptr) {
+        COAUTH_HILOGE(MODULE_SERVICE, "coAuthResMgrPtr_ is nullptr");
+        return;
+    }
     int32_t findRet = coAuthResMgrPtr_->FindScheduleCallback(scheduleId, callback);
-    if (findRet == SUCCESS && callback != nullptr) {
-        std::vector<uint8_t> scheduleToken;
-        callback->OnFinish(TIMEOUT, scheduleToken);
-        Cancel(scheduleId); // cancel schedule
-        COAUTH_HILOGW(MODULE_SERVICE, "Schedule timeout");
-        coAuthResMgrPtr_->DeleteScheduleCallback(scheduleId);
-    } else {
+    if (findRet != SUCCESS || callback == nullptr) {
         COAUTH_HILOGD(MODULE_SERVICE, "Schedule has ended");
+        return;
     }
+    std::vector<uint8_t> scheduleToken;
+    callback->OnFinish(TIMEOUT, scheduleToken);
+    Cancel(scheduleId);
+    COAUTH_HILOGW(MODULE_SERVICE, "Schedule timeout");
+    coAuthResMgrPtr_->DeleteScheduleCallback(scheduleId);
 }
 } // namespace CoAuth
 } // namespace UserIAM
diff --git a/services/src/executor_messenger.cpp b/services/src/executor_messenger.cpp
index 5340f4e..3d459e0 100644
--- a/services/src/executor_messenger.cpp
+++ b/services/src/executor_messenger.cpp
@@ -111,7 +111,7 @@ int32_t ExecutorMessenger::Finish(uint64_t scheduleId, int32_t srcType, int32_t
     int32_t findRet = ScheResPool_->FindScheduleCallback(scheduleId, callback);
     if (findRet != SUCCESS || callback == nullptr) {
         DeleteScheduleInfoById(scheduleId);
-        COAUTH_HILOGE(MODULE_SERVICE, "get schedule callback fail");
+        COAUTH_HILOGE(MODULE_SERVICE, "get schedule callback failed");
         return FAIL;
     }
     std::vector<uint8_t> scheduleToken;
-- 
Gitee


From de6e1fe97b24d3943c880eb89eedf25e6822aabd Mon Sep 17 00:00:00 2001
From: lwk <1076278852@qq.com>
Date: Sat, 19 Mar 2022 21:14:01 +0800
Subject: [PATCH 02/12] fix: codex review and log liuwenkai@huawei.com

Signed-off-by: lwk <1076278852@qq.com>
---
 common/adaptor/src/adaptor_algorithm.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/adaptor/src/adaptor_algorithm.c b/common/adaptor/src/adaptor_algorithm.c
index 4637f83..db64be2 100644
--- a/common/adaptor/src/adaptor_algorithm.c
+++ b/common/adaptor/src/adaptor_algorithm.c
@@ -108,13 +108,13 @@ KeyPair *GenerateEd25519KeyPair(void)
     }
     size_t pubKeySize = keyPair->pubKey->maxSize;
     if (EVP_PKEY_get_raw_public_key(key, keyPair->pubKey->buf, &pubKeySize) != OPENSSL_SUCCESS) {
-        LOG_ERROR("get pub key failed");
+        LOG_ERROR("get public key failed");
         goto ERROR;
     }
     keyPair->pubKey->contentSize = pubKeySize;
     size_t priKeySize = keyPair->priKey->maxSize;
     if (EVP_PKEY_get_raw_private_key(key, keyPair->priKey->buf, &priKeySize) != OPENSSL_SUCCESS) {
-        LOG_ERROR("get pri key failed");
+        LOG_ERROR("get private key failed");
         goto ERROR;
     }
     keyPair->priKey->contentSize = priKeySize;
@@ -187,7 +187,7 @@ int32_t Ed25519Verify(const Buffer *pubKey, const Buffer *data, const Buffer *si
     int32_t ret = RESULT_GENERAL_ERROR;
     EVP_PKEY *key = EVP_PKEY_new_raw_public_key(EVP_PKEY_ED25519, NULL, pubKey->buf, pubKey->contentSize);
     if (key == NULL) {
-        LOG_ERROR("get pub key failed");
+        LOG_ERROR("get public key failed");
         return ret;
     }
     EVP_MD_CTX *ctx = EVP_MD_CTX_new();
-- 
Gitee


From 450483a24017d0a272a6a57933f58de878904fc2 Mon Sep 17 00:00:00 2001
From: lwk <1076278852@qq.com>
Date: Sat, 19 Mar 2022 21:15:41 +0800
Subject: [PATCH 03/12] fix: codex review and log liuwenkai@huawei.com

Signed-off-by: lwk <1076278852@qq.com>
---
 common/adaptor/src/adaptor_algorithm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/adaptor/src/adaptor_algorithm.c b/common/adaptor/src/adaptor_algorithm.c
index db64be2..f5c584c 100644
--- a/common/adaptor/src/adaptor_algorithm.c
+++ b/common/adaptor/src/adaptor_algorithm.c
@@ -258,7 +258,7 @@ int32_t HmacSha256(const Buffer *hmacKey, const Buffer *data, Buffer **hmac)
 int32_t SecureRandom(uint8_t *buffer, uint32_t size)
 {
     if (buffer == NULL || size > INT_MAX) {
-        LOG_ERROR("bad paramed");
+        LOG_ERROR("bad param");
         return RESULT_BAD_PARAM;
     }
     if (RAND_bytes(buffer, (int)size) != OPENSSL_SUCCESS) {
-- 
Gitee


From 506528c12e469122976ff6e54d4aacc883bedeb8 Mon Sep 17 00:00:00 2001
From: lwk <1076278852@qq.com>
Date: Sat, 19 Mar 2022 21:17:54 +0800
Subject: [PATCH 04/12] fix: codex review and log liuwenkai@huawei.com

Signed-off-by: lwk <1076278852@qq.com>
---
 common/database/src/idm_database.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/database/src/idm_database.c b/common/database/src/idm_database.c
index 86dc01f..473bcbe 100644
--- a/common/database/src/idm_database.c
+++ b/common/database/src/idm_database.c
@@ -67,7 +67,7 @@ void DestroyUserInfoList(void)
 static bool MatchUserInfo(void *data, void *condition)
 {
     if (data == NULL || condition == NULL) {
-        LOG_ERROR("params is null, please check invalid node");
+        LOG_ERROR("please check invalid node");
         return false;
     }
     UserInfo *userInfo = (UserInfo *)data;
-- 
Gitee


From ea766a31a9598d69ef226998282f57a83b6a8d59 Mon Sep 17 00:00:00 2001
From: lwk <1076278852@qq.com>
Date: Sat, 19 Mar 2022 21:19:36 +0800
Subject: [PATCH 05/12] fix: codex review and log liuwenkai@huawei.com

Signed-off-by: lwk <1076278852@qq.com>
---
 common/database/src/idm_database.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/common/database/src/idm_database.c b/common/database/src/idm_database.c
index 473bcbe..c2f7757 100644
--- a/common/database/src/idm_database.c
+++ b/common/database/src/idm_database.c
@@ -232,16 +232,17 @@ static ResultCode GetAllEnrolledInfoFromUser(UserInfo *userInfo, EnrolledInfoHal
     }
     LinkedListNode *temp = enrolledInfoList->head;
     ResultCode result = RESULT_SUCCESS;
-    for (*num = 0; *num < size; (*num)++) {
+    uint32_t cnt;
+    for (cnt = 0; cnt < size; cnt++) {
         if (temp == NULL) {
             LOG_ERROR("temp node is null, something wrong");
             result = RESULT_BAD_PARAM;
             goto EXIT;
         }
         EnrolledInfoHal *tempInfo = (EnrolledInfoHal *)temp->data;
-        if (memcpy_s(*enrolledInfos + *num, sizeof(EnrolledInfoHal) * (size - *num),
+        if (memcpy_s(*enrolledInfos + cnt, sizeof(EnrolledInfoHal) * (size - cnt),
             tempInfo, sizeof(EnrolledInfoHal)) != EOK) {
-            LOG_ERROR("copy the %d information failed", *num);
+            LOG_ERROR("copy the %u information failed", cnt);
             result = RESULT_NO_MEMORY;
             goto EXIT;
         }
@@ -254,6 +255,7 @@ EXIT:
         *enrolledInfos = NULL;
         *num = 0;
     }
+    *num = cnt;
     return result;
 }
 
-- 
Gitee


From c88d877f503d0937ac08b0ec5e6393519c5bb0c7 Mon Sep 17 00:00:00 2001
From: lwk <1076278852@qq.com>
Date: Sat, 19 Mar 2022 21:20:23 +0800
Subject: [PATCH 06/12] fix: codex review and log liuwenkai@huawei.com

Signed-off-by: lwk <1076278852@qq.com>
---
 common/database/src/idm_database.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/common/database/src/idm_database.c b/common/database/src/idm_database.c
index c2f7757..78b98ca 100644
--- a/common/database/src/idm_database.c
+++ b/common/database/src/idm_database.c
@@ -230,6 +230,7 @@ static ResultCode GetAllEnrolledInfoFromUser(UserInfo *userInfo, EnrolledInfoHal
         LOG_ERROR("enrolledInfos malloc failed");
         return RESULT_NO_MEMORY;
     }
+    (void)memset_s(*enrolledInfos, sizeof(EnrolledInfoHal) * size, 0, sizeof(EnrolledInfoHal) * size);
     LinkedListNode *temp = enrolledInfoList->head;
     ResultCode result = RESULT_SUCCESS;
     uint32_t cnt;
-- 
Gitee


From 39f68b111035e63790d302ab9284239edc343e4c Mon Sep 17 00:00:00 2001
From: lwk <1076278852@qq.com>
Date: Sat, 19 Mar 2022 21:30:17 +0800
Subject: [PATCH 07/12] fix: codex review and log liuwenkai@huawei.com

Signed-off-by: lwk <1076278852@qq.com>
---
 common/adaptor/src/adaptor_time.c        | 4 ++--
 common/common/src/buffer.c               | 2 +-
 frameworks/kitsimpl/src/coauth_proxy.cpp | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/adaptor/src/adaptor_time.c b/common/adaptor/src/adaptor_time.c
index 1944b54..4ab11df 100644
--- a/common/adaptor/src/adaptor_time.c
+++ b/common/adaptor/src/adaptor_time.c
@@ -26,7 +26,7 @@ uint64_t GetRtcTime(void)
     struct timespec curTime;
     int res = clock_gettime(CLOCK_REALTIME, &curTime);
     if (res != 0) {
-        LOG_ERROR("get time fail");
+        LOG_ERROR("get time failed");
         return 0;
     }
     return curTime.tv_sec * MS_OF_S + curTime.tv_nsec / NS_OF_MS;
@@ -37,7 +37,7 @@ uint64_t GetSystemTime(void)
     struct timespec curTime;
     int res = clock_gettime(CLOCK_MONOTONIC, &curTime);
     if (res != 0) {
-        LOG_ERROR("get time fail");
+        LOG_ERROR("get time failed");
         return 0;
     }
     return curTime.tv_sec * MS_OF_S + curTime.tv_nsec / NS_OF_MS;
diff --git a/common/common/src/buffer.c b/common/common/src/buffer.c
index aa6c62f..4ef1803 100644
--- a/common/common/src/buffer.c
+++ b/common/common/src/buffer.c
@@ -76,7 +76,7 @@ Buffer *CreateBuffer(const uint32_t size)
 Buffer *CreateBufferByData(const uint8_t *data, const uint32_t dataSize)
 {
     if ((data == NULL) || (dataSize == 0) || (dataSize > MAX_BUFFER_SIZE)) {
-        LOG_ERROR("invalid param, size: %u", size);
+        LOG_ERROR("invalid param, dataSize: %u", dataSize);
         return NULL;
     }
 
diff --git a/frameworks/kitsimpl/src/coauth_proxy.cpp b/frameworks/kitsimpl/src/coauth_proxy.cpp
index b79a859..1eede8e 100644
--- a/frameworks/kitsimpl/src/coauth_proxy.cpp
+++ b/frameworks/kitsimpl/src/coauth_proxy.cpp
@@ -144,7 +144,7 @@ void CoAuthProxy::BeginSchedule(uint64_t scheduleId, AuthInfo &authInfo, const s
     uint64_t callerUid;
     authInfo.GetCallerUid(callerUid);
     data.WriteUint64(callerUid);
-    COAUTH_HILOGD(MODULE_INNERKIT, "write callerUid: %{public}" PRIu64, GetCallerUid);
+    COAUTH_HILOGD(MODULE_INNERKIT, "write callerUid: %{public}" PRIu64, callerUid);
 
     if (!data.WriteUint64(scheduleId)) {
         COAUTH_HILOGE(MODULE_INNERKIT, "write scheduleId failed");
-- 
Gitee


From 2205b4a0a6f1d73983ac47df0f4be272e6920872 Mon Sep 17 00:00:00 2001
From: lwk <1076278852@qq.com>
Date: Sat, 19 Mar 2022 21:39:45 +0800
Subject: [PATCH 08/12] fix: codex review and log liuwenkai@huawei.com

Signed-off-by: lwk <1076278852@qq.com>
---
 common/hal_sdk/coauth_interface.cpp | 2 +-
 services/src/auth_res_manager.cpp   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/hal_sdk/coauth_interface.cpp b/common/hal_sdk/coauth_interface.cpp
index 7ee56ec..d38bc8c 100644
--- a/common/hal_sdk/coauth_interface.cpp
+++ b/common/hal_sdk/coauth_interface.cpp
@@ -48,7 +48,7 @@ static ExecutorInfoHal CopyExecutorInfoIn(const ExecutorInfo &executorInfo)
     executorInfoHal.esl = executorInfo.esl;
     executorInfoHal.executorType = executorInfo.executorType;
     if (memcpy_s(executorInfoHal.pubKey, PUBLIC_KEY_LEN, executorInfo.publicKey, PUBLIC_KEY_LEN) != EOK) {
-        LOG_ERROR("memcpy faied");
+        LOG_ERROR("memcpy failed");
     }
     return executorInfoHal;
 }
diff --git a/services/src/auth_res_manager.cpp b/services/src/auth_res_manager.cpp
index 4c9f70b..3e4b1fb 100644
--- a/services/src/auth_res_manager.cpp
+++ b/services/src/auth_res_manager.cpp
@@ -56,7 +56,7 @@ uint64_t AuthResManager::Register(std::shared_ptr<ResAuthExecutor> executorInfo,
     }
     sptr<IRemoteObject::DeathRecipient> dr = new ResIExecutorCallbackDeathRecipient(executorId, this);
     if (!callback->AsObject()->AddDeathRecipient(dr)) {
-        COAUTH_HILOGE(MODULE_SERVICE, "failed to add death recipient ResIExecutorCallbackDeathRecipient");
+        COAUTH_HILOGE(MODULE_SERVICE, "add death recipient ResIExecutorCallbackDeathRecipient failed");
         return INVALID_EXECUTOR_ID;
     }
     coAuthResPool_.Insert(executorId, executorInfo, callback);
-- 
Gitee


From 43b1a39fc822fd3f42c7ddd5461f51dc9425ebcd Mon Sep 17 00:00:00 2001
From: lwk <1076278852@qq.com>
Date: Sat, 19 Mar 2022 21:42:11 +0800
Subject: [PATCH 09/12] fix: codex review and log liuwenkai@huawei.com

Signed-off-by: lwk <1076278852@qq.com>
---
 services/src/coauth_manager.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/src/coauth_manager.cpp b/services/src/coauth_manager.cpp
index f9506e6..63ce528 100644
--- a/services/src/coauth_manager.cpp
+++ b/services/src/coauth_manager.cpp
@@ -245,7 +245,7 @@ void CoAuthManager::ResICoAuthCallbackDeathRecipient::OnRemoteDied(const wptr<IR
         COAUTH_HILOGE(MODULE_SERVICE, "parent or parent coAuthResMgrPtr_ is nullptr");
         return;
     }
-    parent_->coAuthResMgrPtr_->DeleteScheduleCallback(scheduleId); 
+    parent_->coAuthResMgrPtr_->DeleteScheduleCallback(scheduleId);
 }
 
 void CoAuthManager::TimeOut(uint64_t scheduleId)
-- 
Gitee


From 1fd0cdcd8f7e97d0281c47ccad6fdcf9ffe1a6eb Mon Sep 17 00:00:00 2001
From: lwk <1076278852@qq.com>
Date: Sat, 19 Mar 2022 21:52:22 +0800
Subject: [PATCH 10/12] fix: codex review and log liuwenkai@huawei.com

Signed-off-by: lwk <1076278852@qq.com>
---
 common/database/src/idm_database.c               | 16 ++++++----------
 frameworks/kitsimpl/src/coauth_callback_stub.cpp |  6 +++---
 services/src/coauth_manager.cpp                  |  2 +-
 3 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/common/database/src/idm_database.c b/common/database/src/idm_database.c
index 78b98ca..5dd296d 100644
--- a/common/database/src/idm_database.c
+++ b/common/database/src/idm_database.c
@@ -233,17 +233,16 @@ static ResultCode GetAllEnrolledInfoFromUser(UserInfo *userInfo, EnrolledInfoHal
     (void)memset_s(*enrolledInfos, sizeof(EnrolledInfoHal) * size, 0, sizeof(EnrolledInfoHal) * size);
     LinkedListNode *temp = enrolledInfoList->head;
     ResultCode result = RESULT_SUCCESS;
-    uint32_t cnt;
-    for (cnt = 0; cnt < size; cnt++) {
+    for (*num = 0; *num < size; (*num)++) {
         if (temp == NULL) {
             LOG_ERROR("temp node is null, something wrong");
             result = RESULT_BAD_PARAM;
             goto EXIT;
         }
         EnrolledInfoHal *tempInfo = (EnrolledInfoHal *)temp->data;
-        if (memcpy_s(*enrolledInfos + cnt, sizeof(EnrolledInfoHal) * (size - cnt),
+        if (memcpy_s(*enrolledInfos + *num, sizeof(EnrolledInfoHal) * (size - *num),
             tempInfo, sizeof(EnrolledInfoHal)) != EOK) {
-            LOG_ERROR("copy the %u information failed", cnt);
+            LOG_ERROR("copy the %u information failed", *num);
             result = RESULT_NO_MEMORY;
             goto EXIT;
         }
@@ -256,7 +255,6 @@ EXIT:
         *enrolledInfos = NULL;
         *num = 0;
     }
-    *num = cnt;
     return result;
 }
 
@@ -272,17 +270,16 @@ static ResultCode GetAllCredentialInfoFromUser(UserInfo *userInfo, CredentialInf
     (void)memset_s(*credentialInfos, sizeof(CredentialInfoHal) * size, 0, sizeof(CredentialInfoHal) * size);
     LinkedListNode *temp = credentialInfoList->head;
     ResultCode result = RESULT_SUCCESS;
-    uint32_t cnt;
-    for (cnt = 0; cnt < size; cnt++) {
+    for (*num = 0; *num < size; (*num)++) {
         if (temp == NULL) {
             LOG_ERROR("temp node is NULL, something wrong");
             result = RESULT_BAD_PARAM;
             goto EXIT;
         }
         CredentialInfoHal *tempInfo = (CredentialInfoHal *)temp->data;
-        if (memcpy_s((*credentialInfos) + cnt, sizeof(CredentialInfoHal) * (size - cnt),
+        if (memcpy_s((*credentialInfos) + *num, sizeof(CredentialInfoHal) * (size - *num),
             tempInfo, sizeof(CredentialInfoHal)) != EOK) {
-            LOG_ERROR("copy the %u information failed", cnt);
+            LOG_ERROR("copy the %u information failed", *num);
             result = RESULT_NO_MEMORY;
             goto EXIT;
         }
@@ -296,7 +293,6 @@ EXIT:
         *credentialInfos = NULL;
         *num = 0;
     }
-    *num = cnt;
     return result;
 }
 
diff --git a/frameworks/kitsimpl/src/coauth_callback_stub.cpp b/frameworks/kitsimpl/src/coauth_callback_stub.cpp
index a19d5d0..04442dc 100644
--- a/frameworks/kitsimpl/src/coauth_callback_stub.cpp
+++ b/frameworks/kitsimpl/src/coauth_callback_stub.cpp
@@ -32,7 +32,7 @@ int32_t CoAuthCallbackStub::OnRemoteRequest(uint32_t code, MessageParcel &data,
     std::u16string descripter = CoAuthCallbackStub::GetDescriptor();
     std::u16string remoteDescripter = data.ReadInterfaceToken();
     if (descripter != remoteDescripter) {
-        COAUTH_HILOGD(MODULE_INNERKIT, "descriptor is not matched!");
+        COAUTH_HILOGD(MODULE_INNERKIT, "descriptor is not matched");
         return FAIL;
     }
     switch (code) {
@@ -66,7 +66,7 @@ int32_t CoAuthCallbackStub::OnAcquireInfoStub(MessageParcel &data, MessageParcel
 void CoAuthCallbackStub::OnFinish(uint32_t resultCode, std::vector<uint8_t> &scheduleToken)
 {
     if (callback_ == nullptr) {
-        COAUTH_HILOGE(MODULE_INNERKIT, "callback_ is null.");
+        COAUTH_HILOGE(MODULE_INNERKIT, "callback_ is null");
     } else {
         callback_->OnFinish(resultCode, scheduleToken);
     }
@@ -75,7 +75,7 @@ void CoAuthCallbackStub::OnFinish(uint32_t resultCode, std::vector<uint8_t> &sch
 void CoAuthCallbackStub::OnAcquireInfo(uint32_t acquire)
 {
     if (callback_ == nullptr) {
-        COAUTH_HILOGE(MODULE_INNERKIT, "callback_ is null.");
+        COAUTH_HILOGE(MODULE_INNERKIT, "callback_ is null");
     } else {
         callback_->OnAcquireInfo(acquire);
     }
diff --git a/services/src/coauth_manager.cpp b/services/src/coauth_manager.cpp
index 63ce528..b561692 100644
--- a/services/src/coauth_manager.cpp
+++ b/services/src/coauth_manager.cpp
@@ -241,7 +241,7 @@ void CoAuthManager::ResICoAuthCallbackDeathRecipient::OnRemoteDied(const wptr<IR
         COAUTH_HILOGE(MODULE_SERVICE, "remote is nullptr");
         return;
     }
-    if (parent_ == nullptr || parent_->coAuthResMgrPtr_) {
+    if (parent_ == nullptr || parent_->coAuthResMgrPtr_ == nullptr) {
         COAUTH_HILOGE(MODULE_SERVICE, "parent or parent coAuthResMgrPtr_ is nullptr");
         return;
     }
-- 
Gitee


From 3b89ecd196db6f4ae25f2b71ccfd192de7db9eae Mon Sep 17 00:00:00 2001
From: lwk <1076278852@qq.com>
Date: Sat, 19 Mar 2022 21:53:56 +0800
Subject: [PATCH 11/12] fix: codex review and log liuwenkai@huawei.com

Signed-off-by: lwk <1076278852@qq.com>
---
 services/src/coauth_stub.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/src/coauth_stub.cpp b/services/src/coauth_stub.cpp
index f78e025..2488210 100644
--- a/services/src/coauth_stub.cpp
+++ b/services/src/coauth_stub.cpp
@@ -30,7 +30,7 @@ int32_t CoAuthStub::OnRemoteRequest(uint32_t code, MessageParcel &data,
     std::u16string descripter = CoAuthStub::GetDescriptor();
     std::u16string remoteDescripter = data.ReadInterfaceToken();
     if (descripter != remoteDescripter) {
-        COAUTH_HILOGE(MODULE_SERVICE, "CoAuthStub::OnRemoteRequest failed, descriptor is not matched!");
+        COAUTH_HILOGE(MODULE_SERVICE, "descriptor is not matched");
         return E_GET_POWER_SERVICE_FAILED;
     }
 
-- 
Gitee


From 70cfa798c25f390fb02bd1296f2fb7a994375acf Mon Sep 17 00:00:00 2001
From: lwk <1076278852@qq.com>
Date: Sat, 19 Mar 2022 22:03:59 +0800
Subject: [PATCH 12/12] fix: codex review and log liuwenkai@huawei.com

Signed-off-by: lwk <1076278852@qq.com>
---
 services/src/coauth_manager.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/services/src/coauth_manager.cpp b/services/src/coauth_manager.cpp
index b561692..55b207e 100644
--- a/services/src/coauth_manager.cpp
+++ b/services/src/coauth_manager.cpp
@@ -241,11 +241,10 @@ void CoAuthManager::ResICoAuthCallbackDeathRecipient::OnRemoteDied(const wptr<IR
         COAUTH_HILOGE(MODULE_SERVICE, "remote is nullptr");
         return;
     }
-    if (parent_ == nullptr || parent_->coAuthResMgrPtr_ == nullptr) {
-        COAUTH_HILOGE(MODULE_SERVICE, "parent or parent coAuthResMgrPtr_ is nullptr");
-        return;
+    if (parent_ != nullptr && parent_->coAuthResMgrPtr_ != nullptr) {
+        parent_->coAuthResMgrPtr_->DeleteScheduleCallback(scheduleId);
     }
-    parent_->coAuthResMgrPtr_->DeleteScheduleCallback(scheduleId);
+    COAUTH_HILOGW(MODULE_SERVICE, "ResICoAuthCallbackDeathRecipient::Recv death notice.");
 }
 
 void CoAuthManager::TimeOut(uint64_t scheduleId)
-- 
Gitee