Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Third Party CJSON
提交
698dc528
T
Third Party CJSON
项目概览
OpenHarmony
/
Third Party CJSON
大约 1 年 前同步成功
通知
6
Star
22
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
Third Party CJSON
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
698dc528
编写于
2月 16, 2017
作者:
M
Max Bruckner
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
parse_object: improve variable names + const correctness
上级
3dc63390
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
24 addition
and
29 deletion
+24
-29
cJSON.c
cJSON.c
+24
-29
未找到文件。
cJSON.c
浏览文件 @
698dc528
...
...
@@ -817,7 +817,7 @@ static const unsigned char *parse_value(cJSON *item, const unsigned char *value,
static
unsigned
char
*
print_value
(
const
cJSON
*
item
,
size_t
depth
,
cjbool
fmt
,
printbuffer
*
p
);
static
const
unsigned
char
*
parse_array
(
cJSON
*
const
item
,
const
unsigned
char
*
input
,
const
unsigned
char
**
const
ep
);
static
unsigned
char
*
print_array
(
const
cJSON
*
item
,
size_t
depth
,
cjbool
fmt
,
printbuffer
*
p
);
static
const
unsigned
char
*
parse_object
(
cJSON
*
item
,
const
unsigned
char
*
value
,
const
unsigned
char
**
ep
);
static
const
unsigned
char
*
parse_object
(
cJSON
*
const
item
,
const
unsigned
char
*
input
,
const
unsigned
char
**
const
ep
);
static
unsigned
char
*
print_object
(
const
cJSON
*
item
,
size_t
depth
,
cjbool
fmt
,
printbuffer
*
p
);
/* Utility to jump whitespace and cr/lf */
...
...
@@ -1331,26 +1331,25 @@ static unsigned char *print_array(const cJSON *item, size_t depth, cjbool fmt, p
}
/* Build an object from the text. */
static
const
unsigned
char
*
parse_object
(
cJSON
*
item
,
const
unsigned
char
*
value
,
const
unsigned
char
**
error_pointer
)
static
const
unsigned
char
*
parse_object
(
cJSON
*
const
item
,
const
unsigned
char
*
input
,
const
unsigned
char
**
const
error_pointer
)
{
cJSON
*
head
=
NULL
;
/* linked list head */
cJSON
*
current_item
=
NULL
;
if
(
*
value
!=
'{'
)
if
(
*
input
!=
'{'
)
{
/* not an object */
*
error_pointer
=
value
;
goto
fail
;
*
error_pointer
=
input
;
goto
fail
;
/* not an object */
}
value
=
skip
(
value
+
1
);
/* skip whitespace */
if
(
*
value
==
'}'
)
input
=
skip
(
input
+
1
);
/* skip whitespace */
if
(
*
input
==
'}'
)
{
goto
success
;
/* empty object */
}
/* step back to character in front of the first element */
value
--
;
input
--
;
/* loop through the comma separated array elements */
do
{
...
...
@@ -1376,10 +1375,10 @@ static const unsigned char *parse_object(cJSON *item, const unsigned char *value
}
/* parse the name of the child */
value
=
skip
(
value
+
1
);
/* skip whitespaces before name */
value
=
parse_string
(
current_item
,
value
,
error_pointer
);
value
=
skip
(
value
);
/* skip whitespaces after name */
if
(
value
==
NULL
)
input
=
skip
(
input
+
1
);
/* skip whitespaces before name */
input
=
parse_string
(
current_item
,
input
,
error_pointer
);
input
=
skip
(
input
);
/* skip whitespaces after name */
if
(
input
==
NULL
)
{
goto
fail
;
/* faile to parse name */
}
...
...
@@ -1388,38 +1387,34 @@ static const unsigned char *parse_object(cJSON *item, const unsigned char *value
current_item
->
string
=
current_item
->
valuestring
;
current_item
->
valuestring
=
NULL
;
if
(
*
value
!=
':'
)
if
(
*
input
!=
':'
)
{
/* invalid object */
*
error_pointer
=
value
;
goto
fail
;
*
error_pointer
=
input
;
goto
fail
;
/* invalid object */
}
/* parse the value */
value
=
skip
(
value
+
1
);
/* skip whitespaces before value */
value
=
parse_value
(
current_item
,
value
,
error_pointer
);
value
=
skip
(
value
);
/* skip whitespaces after the value */
if
(
value
==
NULL
)
input
=
skip
(
input
+
1
);
/* skip whitespaces before value */
input
=
parse_value
(
current_item
,
input
,
error_pointer
);
input
=
skip
(
input
);
/* skip whitespaces after the value */
if
(
input
==
NULL
)
{
goto
fail
;
/* failed to parse value */
}
}
while
(
*
value
==
','
);
while
(
*
input
==
','
);
if
(
*
value
=
=
'}'
)
if
(
*
input
!
=
'}'
)
{
goto
success
;
/* end of object */
*
error_pointer
=
input
;
goto
fail
;
/* expected end of object */
}
/* malformed object */
*
error_pointer
=
value
;
goto
fail
;
success:
item
->
type
=
cJSON_Object
;
item
->
child
=
head
;
return
value
+
1
;
return
input
+
1
;
fail:
if
(
head
!=
NULL
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录