From 5585660d398c95570c47fecfb39e2a07c3f35191 Mon Sep 17 00:00:00 2001 From: wangyongzhong2 Date: Fri, 25 Feb 2022 15:35:36 +0800 Subject: [PATCH] code refine 2022/2/25 Signed-off-by: wangyongzhong2 --- frameworks/datatransmitmgr/dev_slinfo_adpt.c | 3 ++- frameworks/datatransmitmgr/dev_slinfo_list.c | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/frameworks/datatransmitmgr/dev_slinfo_adpt.c b/frameworks/datatransmitmgr/dev_slinfo_adpt.c index 48ff964..b177576 100644 --- a/frameworks/datatransmitmgr/dev_slinfo_adpt.c +++ b/frameworks/datatransmitmgr/dev_slinfo_adpt.c @@ -283,7 +283,7 @@ int32_t GetDataSecLevelByDevSecLevel(int32_t devLevel) } devTypeMap[] = { { DEV_SEC_LEVEL1, DATA_SEC_LEVEL1 }, { DEV_SEC_LEVEL2, DATA_SEC_LEVEL2 }, - { DEV_SEC_LEVEL3, DATA_SEC_LEVEL4 }, + { DEV_SEC_LEVEL3, DATA_SEC_LEVEL3 }, { DEV_SEC_LEVEL4, DATA_SEC_LEVEL4 }, { DEV_SEC_LEVEL5, DATA_SEC_LEVEL4 }, }; @@ -313,6 +313,7 @@ int32_t UpdateCallbackListParams(DEVSLQueryParams *queryParams, HigestSecInfoCal } if (memcpy_s(newListNode->queryParams.udid, MAX_UDID_LENGTH, queryParams->udid, queryParams->udidLen) != EOK) { DATA_SEC_LOG_ERROR("UpdateCallbackListParams, udid memcpy failed"); + free(newListNode); return DEVSL_ERR_MEM_CPY; } newListNode->queryParams.udidLen = queryParams->udidLen; diff --git a/frameworks/datatransmitmgr/dev_slinfo_list.c b/frameworks/datatransmitmgr/dev_slinfo_list.c index 8d0e351..5c2f627 100644 --- a/frameworks/datatransmitmgr/dev_slinfo_list.c +++ b/frameworks/datatransmitmgr/dev_slinfo_list.c @@ -136,8 +136,8 @@ void LookupCallback(struct DATASLListParams *list, DEVSLQueryParams *queryParams struct DATASLListParams *tmpCallback = list->next; while (tmpCallback != NULL && tmpCallback != list) { struct DATASLListParams *nextCallback = tmpCallback->next; - int32_t result = CompareUdid(&(tmpCallback->callbackParams->queryParams), queryParams); - if (result == SUCCESS) { + int32_t ret = CompareUdid(&(tmpCallback->callbackParams->queryParams), queryParams); + if (ret == SUCCESS) { tmpCallback->callbackParams->callback(&(tmpCallback->callbackParams->queryParams), result, levelInfo); tmpCallback->prev->next = tmpCallback->next; tmpCallback->next->prev = tmpCallback->prev; -- Gitee