Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Third Party CJSON
提交
03f23738
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,发现更多精彩内容 >>
提交
03f23738
编写于
2月 16, 2017
作者:
M
Max Bruckner
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
parse_object: simplify to one do-while loop
上级
24dbf293
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
53 addition
and
61 deletion
+53
-61
cJSON.c
cJSON.c
+53
-61
未找到文件。
cJSON.c
浏览文件 @
03f23738
...
...
@@ -1277,96 +1277,88 @@ 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
**
e
p
)
static
const
unsigned
char
*
parse_object
(
cJSON
*
item
,
const
unsigned
char
*
value
,
const
unsigned
char
**
e
rror_pointer
)
{
cJSON
*
head
=
NULL
;
/* linked list head */
cJSON
*
child
=
NULL
;
cJSON
*
current_item
=
NULL
;
if
(
*
value
!=
'{'
)
{
/* not an object
!
*/
*
e
p
=
value
;
/* not an object */
*
e
rror_pointer
=
value
;
goto
fail
;
}
value
=
skip
(
value
+
1
);
value
=
skip
(
value
+
1
);
/* skip whitespace */
if
(
*
value
==
'}'
)
{
/* empty object. */
goto
success
;
goto
success
;
/* empty object */
}
head
=
child
=
cJSON_New_Item
();
if
(
!
child
)
{
goto
fail
;
}
/* parse first key */
value
=
skip
(
parse_string
(
child
,
skip
(
value
),
ep
));
if
(
!
value
)
{
goto
fail
;
}
/* use string as key, not value */
child
->
string
=
child
->
valuestring
;
child
->
valuestring
=
NULL
;
if
(
*
value
!=
':'
)
{
/* invalid object. */
*
ep
=
value
;
goto
fail
;
}
/* skip any spacing, get the value. */
value
=
skip
(
parse_value
(
child
,
skip
(
value
+
1
),
ep
));
if
(
!
value
)
/* step back to character in front of the first element */
value
--
;
/* loop through the comma separated array elements */
do
{
goto
fail
;
}
/* allocate next item */
cJSON
*
new_item
=
cJSON_New_Item
();
if
(
new_item
==
NULL
)
{
goto
fail
;
/* allocation failure */
}
while
(
*
value
==
','
)
{
cJSON
*
new_item
=
NULL
;
if
(
!
(
new_item
=
cJSON_New_Item
()))
/* attach next item to list */
if
(
head
==
NULL
)
{
/* memory fail */
goto
fail
;
/* start the linked list */
current_item
=
head
=
new_item
;
}
else
{
/* add to the end and advance */
current_item
->
next
=
new_item
;
new_item
->
prev
=
current_item
;
current_item
=
new_item
;
}
/* add to linked list */
child
->
next
=
new_item
;
new_item
->
prev
=
child
;
child
=
new_item
;
value
=
skip
(
parse_string
(
child
,
skip
(
value
+
1
),
ep
));
if
(
!
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
)
{
goto
fail
;
goto
fail
;
/* faile to parse name */
}
/*
use string as key, not valu
e */
c
hild
->
string
=
child
->
valuestring
;
c
hild
->
valuestring
=
NULL
;
/*
swap valuestring and string, because we parsed the nam
e */
c
urrent_item
->
string
=
current_item
->
valuestring
;
c
urrent_item
->
valuestring
=
NULL
;
if
(
*
value
!=
':'
)
{
/* invalid object
.
*/
*
e
p
=
value
;
/* invalid object */
*
e
rror_pointer
=
value
;
goto
fail
;
}
/* skip any spacing, get the value. */
value
=
skip
(
parse_value
(
child
,
skip
(
value
+
1
),
ep
));
if
(
!
value
)
/* 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
)
{
goto
fail
;
goto
fail
;
/* failed to parse value */
}
}
/* end of object */
while
(
*
value
==
','
);
if
(
*
value
==
'}'
)
{
goto
success
;
goto
success
;
/* end of object */
}
/* malformed */
*
e
p
=
value
;
/* malformed
object
*/
*
e
rror_pointer
=
value
;
goto
fail
;
success:
...
...
@@ -1376,9 +1368,9 @@ success:
return
value
+
1
;
fail:
if
(
chil
d
!=
NULL
)
if
(
hea
d
!=
NULL
)
{
cJSON_Delete
(
chil
d
);
cJSON_Delete
(
hea
d
);
}
return
NULL
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录