From 5c768351a9cf127d2154ef3531d2bcf27da6d05c Mon Sep 17 00:00:00 2001
From: "411148299@qq.com" <411148299@qq.com>
Date: Wed, 29 Sep 2021 14:34:27 +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/include/param_manager.h | 6 +++---
 services/param/manager/param_manager.c | 2 +-
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/services/include/param/param.h b/services/include/param/param.h
index f19488a3..7a57bf00 100755
--- a/services/include/param/param.h
+++ b/services/include/param/param.h
@@ -28,7 +28,6 @@ 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 e58854b3..f9e1942b 100644
--- a/services/include/param/sys_param.h
+++ b/services/include/param/sys_param.h
@@ -65,8 +65,7 @@ int SystemGetParameterCommitId(ParamHandle handle, uint32_t *commitId);
  * 遍历参数。
  *
  */
-int SystemTraversalParameter(
-    void (*traversalParameter)(ParamHandle handle, ParamContextPtr cookie), ParamContextPtr cookie);
+int SystemTraversalParameter(void (*traversalParameter)(ParamHandle handle, void *cookie), void *cookie);
 
 /**
  * 外部接口
diff --git a/services/param/include/param_manager.h b/services/param/include/param_manager.h
index 30f5f7ea..c14c4ba2 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, ParamContextPtr context);
+typedef void (*TraversalParamPtr)(ParamHandle handle, void *context);
 typedef struct {
     TraversalParamPtr traversalParamPtr;
-    ParamContextPtr context;
+    void *context;
 } ParamTraversalContext;
-int TraversalParam(const ParamWorkSpace *workSpace, TraversalParamPtr walkFunc, ParamContextPtr cookie);
+int TraversalParam(const ParamWorkSpace *workSpace, TraversalParamPtr walkFunc, void *cookie);
 
 ParamWorkSpace *GetParamWorkSpace(void);
 ParamWorkSpace *GetClientParamWorkSpace(void);
diff --git a/services/param/manager/param_manager.c b/services/param/manager/param_manager.c
index 962ca025..abd7372b 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, ParamContextPtr cookie)
+int TraversalParam(const ParamWorkSpace *workSpace, TraversalParamPtr walkFunc, void *cookie)
 {
     PARAM_CHECK(workSpace != NULL && walkFunc != NULL, return PARAM_CODE_INVALID_PARAM, "Invalid param");
     ParamTraversalContext context = {
-- 
GitLab