Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Third Party CJSON
提交
d441fa05
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,发现更多精彩内容 >>
提交
d441fa05
编写于
3月 03, 2017
作者:
M
Max Bruckner
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
print_value: return boolean instead of pointer
上级
3fe72cf2
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
14 addition
and
9 deletion
+14
-9
cJSON.c
cJSON.c
+13
-8
tests/print_value.c
tests/print_value.c
+1
-1
未找到文件。
cJSON.c
浏览文件 @
d441fa05
...
...
@@ -813,7 +813,7 @@ static unsigned char *print_string(const cJSON * const item, printbuffer * const
/* Predeclare these prototypes. */
static
const
unsigned
char
*
parse_value
(
cJSON
*
const
item
,
const
unsigned
char
*
const
input
,
const
unsigned
char
**
const
ep
,
const
internal_hooks
*
const
hooks
);
static
unsigned
char
*
print_value
(
const
cJSON
*
const
item
,
const
size_t
depth
,
const
cJSON_bool
format
,
printbuffer
*
const
output_buffer
,
const
internal_hooks
*
const
hooks
);
static
cJSON_bool
print_value
(
const
cJSON
*
const
item
,
const
size_t
depth
,
const
cJSON_bool
format
,
printbuffer
*
const
output_buffer
,
const
internal_hooks
*
const
hooks
);
static
const
unsigned
char
*
parse_array
(
cJSON
*
const
item
,
const
unsigned
char
*
input
,
const
unsigned
char
**
const
ep
,
const
internal_hooks
*
const
hooks
);
static
unsigned
char
*
print_array
(
const
cJSON
*
const
item
,
const
size_t
depth
,
const
cJSON_bool
format
,
printbuffer
*
const
output_buffer
,
const
internal_hooks
*
const
hooks
);
static
const
unsigned
char
*
parse_object
(
cJSON
*
const
item
,
const
unsigned
char
*
input
,
const
unsigned
char
**
const
ep
,
const
internal_hooks
*
const
hooks
);
...
...
@@ -893,7 +893,7 @@ static unsigned char *print(const cJSON * const item, cJSON_bool format, const i
}
/* print the value */
if
(
print_value
(
item
,
0
,
format
,
buffer
,
hooks
)
==
NULL
)
if
(
!
print_value
(
item
,
0
,
format
,
buffer
,
hooks
)
)
{
goto
fail
;
}
...
...
@@ -957,7 +957,12 @@ CJSON_PUBLIC(char *) cJSON_PrintBuffered(const cJSON *item, int prebuffer, cJSON
p
.
offset
=
0
;
p
.
noalloc
=
false
;
return
(
char
*
)
print_value
(
item
,
0
,
fmt
,
&
p
,
&
global_hooks
);
if
(
!
print_value
(
item
,
0
,
fmt
,
&
p
,
&
global_hooks
))
{
return
NULL
;
}
return
(
char
*
)
p
.
buffer
;
}
CJSON_PUBLIC
(
cJSON_bool
)
cJSON_PrintPreallocated
(
cJSON
*
item
,
char
*
buf
,
const
int
len
,
const
cJSON_bool
fmt
)
...
...
@@ -973,7 +978,7 @@ CJSON_PUBLIC(cJSON_bool) cJSON_PrintPreallocated(cJSON *item, char *buf, const i
p
.
length
=
(
size_t
)
len
;
p
.
offset
=
0
;
p
.
noalloc
=
true
;
return
print_value
(
item
,
0
,
fmt
,
&
p
,
&
global_hooks
)
!=
NULL
;
return
print_value
(
item
,
0
,
fmt
,
&
p
,
&
global_hooks
);
}
/* Parser core - when encountering text, process appropriately. */
...
...
@@ -1031,13 +1036,13 @@ static const unsigned char *parse_value(cJSON * const item, const unsigned char
}
/* Render a value to text. */
static
unsigned
char
*
print_value
(
const
cJSON
*
const
item
,
const
size_t
depth
,
const
cJSON_bool
format
,
printbuffer
*
const
output_buffer
,
const
internal_hooks
*
const
hooks
)
static
cJSON_bool
print_value
(
const
cJSON
*
const
item
,
const
size_t
depth
,
const
cJSON_bool
format
,
printbuffer
*
const
output_buffer
,
const
internal_hooks
*
const
hooks
)
{
unsigned
char
*
output
=
NULL
;
if
((
item
==
NULL
)
||
(
output_buffer
==
NULL
))
{
return
NULL
;
return
false
;
}
switch
((
item
->
type
)
&
0xFF
)
...
...
@@ -1101,7 +1106,7 @@ static unsigned char *print_value(const cJSON * const item, const size_t depth,
break
;
}
return
output
;
return
output
!=
NULL
;
}
/* Build an array from input text. */
...
...
@@ -1210,7 +1215,7 @@ static unsigned char *print_array(const cJSON * const item, const size_t depth,
while
(
current_element
!=
NULL
)
{
if
(
print_value
(
current_element
,
depth
+
1
,
format
,
output_buffer
,
hooks
)
==
NULL
)
if
(
!
print_value
(
current_element
,
depth
+
1
,
format
,
output_buffer
,
hooks
)
)
{
return
NULL
;
}
...
...
tests/print_value.c
浏览文件 @
d441fa05
...
...
@@ -43,7 +43,7 @@ static void assert_print_value(const char *input)
TEST_ASSERT_NOT_NULL_MESSAGE
(
parse_value
(
item
,
(
const
unsigned
char
*
)
input
,
&
error_pointer
,
&
global_hooks
),
"Failed to parse value."
);
TEST_ASSERT_
NOT_NULL
_MESSAGE
(
print_value
(
item
,
0
,
false
,
&
buffer
,
&
global_hooks
),
"Failed to print value."
);
TEST_ASSERT_
TRUE
_MESSAGE
(
print_value
(
item
,
0
,
false
,
&
buffer
,
&
global_hooks
),
"Failed to print value."
);
TEST_ASSERT_EQUAL_STRING_MESSAGE
(
input
,
buffer
.
buffer
,
"Printed value is not as expected."
);
reset
(
item
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录