From c3f260c5274ff98ca7c757499e57d38d5646c1a3 Mon Sep 17 00:00:00 2001 From: wangyongzhong2 Date: Wed, 16 Mar 2022 11:03:00 +0800 Subject: [PATCH] code refine 03/06 Signed-off-by: wangyongzhong2 --- README_zh.md | 6 ++---- frameworks/datatransmitmgr/dev_slinfo_adpt.c | 6 +++--- frameworks/datatransmitmgr/dev_slinfo_mgr.c | 8 ++++---- .../innerkits/datatransmitmgr/include/dev_slinfo_adpt.h | 2 +- 4 files changed, 10 insertions(+), 12 deletions(-) diff --git a/README_zh.md b/README_zh.md index c2a6b5f..a89935c 100644 --- a/README_zh.md +++ b/README_zh.md @@ -47,16 +47,14 @@ ## 接口说明 -设备认证组件中，设备群组管理服务负责将不同业务建立的设备间可信关系抽象成一个个可信群组，对外提供统一的接口，包含群组创建、删除、查询等功能；设备群组认证服务基于已经建立过可信关系的设备群组，提供设备可信认证与端到端会话密钥协商功能。 - **表 2** 数据传输管控提供的API接口功能介绍 | 接口名 | 描述 | | ------------------------------------------------------------ | -------------------------------------- | | int32_t DATASL_GetHighestSecLevel(DEVSLQueryParams *queryParams, uint32_t *levelInfo); | 获取对应设备可支持的数据风险等级。 | | int32_t DATASL_GetHighestSecLevelAsync(DEVSLQueryParams *queryParams, HigestSecInfoCallback *callback); | 异步获取对应设备可支持的数据风险等级。 | -| int32_t DATASL_OnStart(void); | 模块初始化 | -| void DATASL_OnStop(void); | 模块去初始化 | +| int32_t DATASL_OnStart(void); | 模块初始化。 | +| void DATASL_OnStop(void); | 模块去初始化。 | diff --git a/frameworks/datatransmitmgr/dev_slinfo_adpt.c b/frameworks/datatransmitmgr/dev_slinfo_adpt.c index e332f03..51ea95b 100644 --- a/frameworks/datatransmitmgr/dev_slinfo_adpt.c +++ b/frameworks/datatransmitmgr/dev_slinfo_adpt.c @@ -277,13 +277,13 @@ int32_t CompareUdid(DEVSLQueryParams *queryParamsL, DEVSLQueryParams *queryParam return DEVSL_SUCCESS; } -int32_t GetDataSecLevelByDevSecLevel(int32_t devLevel) +uint32_t GetDataSecLevelByDevSecLevel(int32_t devLevel) { int32_t i; int32_t n; struct { int32_t devSecLevel; - int32_t dataSecLevel; + uint32_t dataSecLevel; } devTypeMap[] = { { DEV_SEC_LEVEL1, DATA_SEC_LEVEL1 }, { DEV_SEC_LEVEL2, DATA_SEC_LEVEL2 }, @@ -309,7 +309,7 @@ int32_t UpdateCallbackListParams(DEVSLQueryParams *queryParams, HigestSecInfoCal DATA_SEC_LOG_INFO("Enter UpdateCallbackListParams..."); int32_t ret; int32_t result = DEVSL_ERR_REQUEST_DEVICE_EXCEED_LIMIT; - int32_t levelInfo = DEFAULT_DEV_SEC_LEVEL; + uint32_t levelInfo = DEFAULT_DEV_SEC_LEVEL; struct DATASLCallbackParams *newListNode = (struct DATASLCallbackParams*)malloc(sizeof(struct DATASLCallbackParams)); diff --git a/frameworks/datatransmitmgr/dev_slinfo_mgr.c b/frameworks/datatransmitmgr/dev_slinfo_mgr.c index cad4976..5861c2f 100644 --- a/frameworks/datatransmitmgr/dev_slinfo_mgr.c +++ b/frameworks/datatransmitmgr/dev_slinfo_mgr.c @@ -23,7 +23,7 @@ extern "C" { #define DATASL_API __attribute__ ((visibility ("default"))) -static int32_t GetHigestSecLevelByUdid(DEVSLQueryParams *queryParams, uint32_t *dataLevel) +static int32_t GetHighestSecLevelByUdid(DEVSLQueryParams *queryParams, uint32_t *dataLevel) { int32_t ret; int32_t devLevel = DEFAULT_DEV_SEC_LEVEL; @@ -35,7 +35,7 @@ static int32_t GetHigestSecLevelByUdid(DEVSLQueryParams *queryParams, uint32_t * ret = GetDeviceSecLevelByUdid(queryParams->udid, queryParams->udidLen, &devLevel); if (ret != DEVSL_SUCCESS) { *dataLevel = DATA_SEC_LEVEL0; - DATA_SEC_LOG_ERROR("GetHigestSecLevelByUdid: get device security level failed, error code: %d", ret); + DATA_SEC_LOG_ERROR("GetHighestSecLevelByUdid: get device security level failed, error code: %d", ret); return ret; } @@ -68,13 +68,13 @@ DATASL_API void DATASL_OnStop(void) DATASL_API int32_t DATASL_GetHighestSecLevel(DEVSLQueryParams *queryParams, uint32_t *levelInfo) { - int32_t ret = 0; + int32_t ret; DATA_SEC_LOG_INFO("Enter DATASL_GetHighestSecLevel..."); if ((queryParams == NULL) || (levelInfo == NULL)) { return DEVSL_ERR_BAD_PARAMETERS; } - ret = GetHigestSecLevelByUdid(queryParams, levelInfo); + ret = GetHighestSecLevelByUdid(queryParams, levelInfo); DATA_SEC_LOG_INFO("DATASL_GetHighestSecLevel done!"); return ret; diff --git a/interfaces/innerkits/datatransmitmgr/include/dev_slinfo_adpt.h b/interfaces/innerkits/datatransmitmgr/include/dev_slinfo_adpt.h index 437225c..9ecbef8 100644 --- a/interfaces/innerkits/datatransmitmgr/include/dev_slinfo_adpt.h +++ b/interfaces/innerkits/datatransmitmgr/include/dev_slinfo_adpt.h @@ -60,7 +60,7 @@ int32_t CompareUdid(DEVSLQueryParams *queryParamsL, DEVSLQueryParams *queryParam int32_t GetDeviceSecLevelByUdidAsync(const uint8_t *udid, uint32_t udidLen); -int32_t GetDataSecLevelByDevSecLevel(int32_t devLevel); +uint32_t GetDataSecLevelByDevSecLevel(int32_t devLevel); int32_t UpdateCallbackListParams(DEVSLQueryParams *queryParams, HigestSecInfoCallback *callback); -- Gitee