提交 b6892c1d 编写于 作者: 4 411148299@qq.com

fix code style

Signed-off-by: N411148299@qq.com <411148299@qq.com>
上级 d510c9cd
......@@ -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,
......
......@@ -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);
/**
* 外部接口
......
......@@ -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");
......
......@@ -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);
......
......@@ -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 = {
......
......@@ -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++) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册