From b6892c1dc7a6caaeee460b325a2ba404da77e5e6 Mon Sep 17 00:00:00 2001
From: "411148299@qq.com" <411148299@qq.com>
Date: Wed, 29 Sep 2021 14:08:18 +0800
Subject: [PATCH] fix code style

Signed-off-by: 411148299@qq.com <411148299@qq.com>
---
 services/include/param/param.h         | 1 +
 services/include/param/sys_param.h     | 3 ++-
 services/param/client/param_request.c  | 3 ++-
 services/param/include/param_manager.h | 6 +++---
 services/param/manager/param_manager.c | 2 +-
 services/param/manager/param_utils.c   | 2 +-
 6 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/services/include/param/param.h b/services/include/param/param.h
index 7a57bf00..f19488a3 100755
--- a/services/include/param/param.h
+++ b/services/include/param/param.h
@@ -28,6 +28,7 @@ extern "C" {
 #define PARAM_VALUE_LEN_MAX  96
 #define PARAM_NAME_LEN_MAX  96
 typedef uint32_t ParamHandle;
+typedef void * ParamContextPtr;
 
 typedef enum {
     PARAM_CODE_ERROR = -1,
diff --git a/services/include/param/sys_param.h b/services/include/param/sys_param.h
index 97089819..e58854b3 100644
--- a/services/include/param/sys_param.h
+++ b/services/include/param/sys_param.h
@@ -65,7 +65,8 @@ int SystemGetParameterCommitId(ParamHandle handle, uint32_t *commitId);
  * 遍历参数。
  *
  */
-int SystemTraversalParameter(void (*traversalParameter)(ParamHandle handle, void* cookie), void* cookie);
+int SystemTraversalParameter(
+    void (*traversalParameter)(ParamHandle handle, ParamContextPtr cookie), ParamContextPtr cookie);
 
 /**
  * 外部接口
diff --git a/services/param/client/param_request.c b/services/param/client/param_request.c
index 24c5ab97..557a690f 100644
--- a/services/param/client/param_request.c
+++ b/services/param/client/param_request.c
@@ -274,7 +274,8 @@ int SystemGetParameterValue(ParamHandle handle, char *value, unsigned int *len)
     return ReadParamValue(&g_clientSpace.paramSpace, handle, value, len);
 }
 
-int SystemTraversalParameter(void (*traversalParameter)(ParamHandle handle, void *cookie), void *cookie)
+int SystemTraversalParameter(
+    void (*traversalParameter)(ParamHandle handle, ParamContextPtr cookie), ParamContextPtr cookie)
 {
     InitParamClient();
     PARAM_CHECK(traversalParameter != NULL, return -1, "The param is null");
diff --git a/services/param/include/param_manager.h b/services/param/include/param_manager.h
index c14c4ba2..30f5f7ea 100644
--- a/services/param/include/param_manager.h
+++ b/services/param/include/param_manager.h
@@ -63,12 +63,12 @@ int CheckParamName(const char *name, int paramInfo);
 int CheckParamPermission(const ParamWorkSpace *workSpace,
     const ParamSecurityLabel *srcLabel, const char *name, uint32_t mode);
 
-typedef void (*TraversalParamPtr)(ParamHandle handle, void *context);
+typedef void (*TraversalParamPtr)(ParamHandle handle, ParamContextPtr context);
 typedef struct {
     TraversalParamPtr traversalParamPtr;
-    void *context;
+    ParamContextPtr context;
 } ParamTraversalContext;
-int TraversalParam(const ParamWorkSpace *workSpace, TraversalParamPtr walkFunc, void *cookie);
+int TraversalParam(const ParamWorkSpace *workSpace, TraversalParamPtr walkFunc, ParamContextPtr cookie);
 
 ParamWorkSpace *GetParamWorkSpace(void);
 ParamWorkSpace *GetClientParamWorkSpace(void);
diff --git a/services/param/manager/param_manager.c b/services/param/manager/param_manager.c
index abd7372b..962ca025 100644
--- a/services/param/manager/param_manager.c
+++ b/services/param/manager/param_manager.c
@@ -204,7 +204,7 @@ static int ProcessParamTraversal(const WorkSpace *workSpace, const ParamTrieNode
     return 0;
 }
 
-int TraversalParam(const ParamWorkSpace *workSpace, TraversalParamPtr walkFunc, void *cookie)
+int TraversalParam(const ParamWorkSpace *workSpace, TraversalParamPtr walkFunc, ParamContextPtr cookie)
 {
     PARAM_CHECK(workSpace != NULL && walkFunc != NULL, return PARAM_CODE_INVALID_PARAM, "Invalid param");
     ParamTraversalContext context = {
diff --git a/services/param/manager/param_utils.c b/services/param/manager/param_utils.c
index 58154227..77b34a0c 100755
--- a/services/param/manager/param_utils.c
+++ b/services/param/manager/param_utils.c
@@ -114,7 +114,7 @@ static void TrimString(char *string, uint32_t currLen)
 
 int GetSubStringInfo(const char *buff, uint32_t buffLen, char delimiter, SubStringInfo *info, int subStrNumber)
 {
-    PARAM_CHECK(buff == NULL && info == NULL, return 0, "Invalid buff");
+    PARAM_CHECK(buff != NULL && info != NULL, return 0, "Invalid buff");
     size_t i = 0;
     // 去掉开始的空格
     for (; i < strlen(buff); i++) {
-- 
GitLab