test/awtk
1
0
Fork 0
mirror of https://gitee.com/zlgopen/awtk.git synced 2024-11-29 18:48:09 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

improve conf json

Browse Source
This commit is contained in:
lixianjing 2024-07-24 18:48:20 +08:00
parent 37ded16822
commit a82e2d2f16
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/changes.md
View File

@ -2,6 +2,7 @@
2024/07/23
* 修复部分linux设备获取串口配置不正常的问题(感谢智明提供补丁)
* 优化conf_json_parse_array接口效率(感谢雨欣提供补丁)
2024/07/22
* 修正dragger save\_x和save\_y(感谢颖健提供补丁)

11
src/conf_io/conf_json.c
View File

@ -141,8 +141,9 @@ static ret_t conf_json_parse_object(json_parser_t* parser) {
static ret_t conf_json_parse_array(json_parser_t* parser) {
char c = '\0';
uint32_t i = 0;
char name[TK_NAME_LEN + 1];
conf_node_t* node = NULL;
conf_node_t* prev = NULL;
char name[TK_NAME_LEN + 1];
parser->cursor++;
conf_json_skip_all_comments(parser);
@ -152,14 +153,20 @@ static ret_t conf_json_parse_array(json_parser_t* parser) {
return RET_OK;
}
prev = conf_node_get_first_child(parser->current);
while (parser->cursor < parser->size) {
tk_snprintf(name, TK_NAME_LEN, "%u", i++);
node = conf_doc_create_node(parser->doc, name);
return_value_if_fail(node != NULL, RET_OOM);
conf_doc_append_child(parser->doc, parser->current, node);
if (prev == NULL) {
conf_doc_append_child(parser->doc, parser->current, node);
} else {
conf_doc_append_sibling(parser->doc, prev, node);
}
parser->current = node;
return_value_if_fail(conf_json_parse_value(parser) == RET_OK, RET_FAIL);
parser->current = node->parent;
prev = node;
conf_json_skip_all_comments(parser);
c = parser->data[parser->cursor];