diff --git a/services/include/param/param.h b/services/include/param/param.h index f19488a3aeaab8944dccb73341bd50ab395d0e56..7a57bf0006314b27998ec6e70c11586e216fa0a1 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 e58854b39668c023a591a16a23a11dfe7e4bb92d..f9e1942beace884ec449d3763f4eebd213c75171 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 30f5f7eaabb39f0af0bf5e42ac1022ab163696b6..c14c4ba261d40c0a394e143e4b7f7dea3de0b69e 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 962ca02537e5ee763da81eb6d11e7191cbb93d2d..abd7372b182baa0ee99d7cd7aceca72c3959a806 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 = {