From 2db6fd58854465f60c371a1c79987efd1133ae24 Mon Sep 17 00:00:00 2001 From: mtf Date: Fri, 8 Apr 2022 09:57:33 +0800 Subject: [PATCH] change name CreateBuffer to CreateBufferBySize Signed-off-by: mtf --- common/adaptor/src/adaptor_algorithm.c | 8 ++++---- common/common/inc/buffer.h | 2 +- common/common/src/buffer.c | 4 ++-- common/database/src/idm_file_manager.c | 4 ++-- common/key_mgr/src/token_key.c | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/common/adaptor/src/adaptor_algorithm.c b/common/adaptor/src/adaptor_algorithm.c index f5c584c..56cf252 100644 --- a/common/adaptor/src/adaptor_algorithm.c +++ b/common/adaptor/src/adaptor_algorithm.c @@ -38,13 +38,13 @@ static KeyPair *CreateEd25519KeyPair() LOG_ERROR("no memory for key pair"); return NULL; } - keyPair->pubKey = CreateBuffer(ED25519_FIX_PUBKEY_BUFFER_SIZE); + keyPair->pubKey = CreateBufferBySize(ED25519_FIX_PUBKEY_BUFFER_SIZE); if (keyPair->pubKey == NULL) { LOG_ERROR("no memory for public key"); Free(keyPair); return NULL; } - keyPair->priKey = CreateBuffer(ED25519_FIX_PRIKEY_BUFFER_SIZE); + keyPair->priKey = CreateBufferBySize(ED25519_FIX_PRIKEY_BUFFER_SIZE); if (keyPair->priKey == NULL) { LOG_ERROR("no memory for private key"); DestoryBuffer(keyPair->pubKey); @@ -156,7 +156,7 @@ int32_t Ed25519Sign(const KeyPair *keyPair, const Buffer *data, Buffer **sign) LOG_ERROR("init sign failed"); goto EXIT; } - *sign = CreateBuffer(ED25519_FIX_SIGN_BUFFER_SIZE); + *sign = CreateBufferBySize(ED25519_FIX_SIGN_BUFFER_SIZE); if (!IsBufferValid(*sign)) { LOG_ERROR("create buffer failed"); goto EXIT; @@ -241,7 +241,7 @@ int32_t HmacSha256(const Buffer *hmacKey, const Buffer *data, Buffer **hmac) LOG_ERROR("no algo"); return RESULT_GENERAL_ERROR; } - *hmac = CreateBuffer(SHA256_DIGEST_SIZE); + *hmac = CreateBufferBySize(SHA256_DIGEST_SIZE); if (*hmac == NULL) { LOG_ERROR("create buffer failed"); return RESULT_NO_MEMORY; diff --git a/common/common/inc/buffer.h b/common/common/inc/buffer.h index c6ed33c..486770e 100644 --- a/common/common/inc/buffer.h +++ b/common/common/inc/buffer.h @@ -27,7 +27,7 @@ typedef struct { } Buffer; bool IsBufferValid(const Buffer *buffer); -Buffer *CreateBuffer(const uint32_t size); +Buffer *CreateBufferBySize(const uint32_t size); void DestoryBuffer(Buffer *buffer); Buffer *CopyBuffer(const Buffer *buffer); bool CompareBuffer(const Buffer *buffer1, const Buffer *buffer2); diff --git a/common/common/src/buffer.c b/common/common/src/buffer.c index b9f540d..33d187b 100644 --- a/common/common/src/buffer.c +++ b/common/common/src/buffer.c @@ -42,7 +42,7 @@ bool CheckBufferWithSize(const Buffer *buffer, const uint32_t size) return true; } -Buffer *CreateBuffer(const uint32_t size) +Buffer *CreateBufferBySize(const uint32_t size) { if ((size == 0) || (size > MAX_BUFFER_SIZE)) { LOG_ERROR("invalid param, size: %u", size); @@ -127,7 +127,7 @@ Buffer *CopyBuffer(const Buffer *buffer) return NULL; } - Buffer *copyBuffer = CreateBuffer(buffer->maxSize); + Buffer *copyBuffer = CreateBufferBySize(buffer->maxSize); if (copyBuffer == NULL) { LOG_ERROR("create buffer failed"); return NULL; diff --git a/common/database/src/idm_file_manager.c b/common/database/src/idm_file_manager.c index c4c5d9e..a51c019 100644 --- a/common/database/src/idm_file_manager.c +++ b/common/database/src/idm_file_manager.c @@ -181,7 +181,7 @@ ResultCode UpdateFileInfo(LinkedList *userInfoList) LOG_ERROR("userInfo list is null"); return RESULT_BAD_PARAM; } - Buffer *parcel = CreateBuffer(PRE_APPLY_LEN); + Buffer *parcel = CreateBufferBySize(PRE_APPLY_LEN); if (parcel == NULL) { LOG_ERROR("parcel is null"); return RESULT_BAD_PARAM; @@ -351,7 +351,7 @@ static Buffer *ReadFileInfo() LOG_ERROR("open file failed"); return NULL; } - Buffer *parcel = CreateBuffer(fileSize); + Buffer *parcel = CreateBufferBySize(fileSize); if (parcel == NULL) { LOG_ERROR("parcel create failed"); return NULL; diff --git a/common/key_mgr/src/token_key.c b/common/key_mgr/src/token_key.c index 65af012..8cc4f7e 100644 --- a/common/key_mgr/src/token_key.c +++ b/common/key_mgr/src/token_key.c @@ -37,7 +37,7 @@ ResultCode InitTokenKey(void) if (g_tokenKey != NULL) { return RESULT_SUCCESS; } - g_tokenKey = CreateBuffer(SHA256_KEY_LEN); + g_tokenKey = CreateBufferBySize(SHA256_KEY_LEN); if (g_tokenKey == NULL) { LOG_ERROR("g_tokenKey: create buffer failed"); return RESULT_NO_MEMORY; -- Gitee