From bcc57f4034634aca4fc1da1563545b3faf783fbb Mon Sep 17 00:00:00 2001 From: lixiumei Date: Thu, 13 Jan 2022 16:38:57 +0800 Subject: [PATCH] Fixing problems with neu_json_tty.c and json_group_configs.c autogenerated code --- src/parser/neu_json_tty.c | 24 ++++++++--------- src/persist/json_group_configs.c | 44 +++++++------------------------- 2 files changed, 21 insertions(+), 47 deletions(-) diff --git a/src/parser/neu_json_tty.c b/src/parser/neu_json_tty.c index 878ef06c..fc229263 100644 --- a/src/parser/neu_json_tty.c +++ b/src/parser/neu_json_tty.c @@ -31,29 +31,29 @@ int neu_json_encode_get_tty_resp(void *json_object, void *param) { - int ret = 0; - neu_json_get_tty_resp_t *resp = (neu_json_get_tty_resp_t *) param; + int ret = 0; - void * tty_array = NULL; - neu_json_get_tty_resp_tty_t *p_tty = resp->ttys; + neu_json_get_tty_resp_t *resp = (neu_json_get_tty_resp_t *) param; + void * tty_array = NULL; + + neu_json_get_tty_resp_tty_t *p_tty = resp->ttys; for (int i = 0; i < resp->n_tty; i++) { - neu_json_elem_t tty_elems[] = { { + neu_json_elem_t tty_elems = { .name = NULL, .t = NEU_JSON_STR, .v.val_str = *p_tty, - } }; - tty_array = neu_json_encode_array(tty_array, tty_elems, - NEU_JSON_ELEM_SIZE(tty_elems)); + }; + + tty_array = neu_json_encode_array_value(tty_array, &tty_elems, 1); p_tty++; } - neu_json_elem_t resp_elems[] = { { + neu_json_elem_t resp_elems = { .name = "ttys", .t = NEU_JSON_OBJECT, .v.val_object = tty_array, - } }; - ret = neu_json_encode_field(json_object, resp_elems, - NEU_JSON_ELEM_SIZE(resp_elems)); + }; + ret = neu_json_encode_field(json_object, &resp_elems, 1); return ret; } diff --git a/src/persist/json_group_configs.c b/src/persist/json_group_configs.c index 401faf76..2ab3a52c 100644 --- a/src/persist/json_group_configs.c +++ b/src/persist/json_group_configs.c @@ -22,6 +22,7 @@ * It was automatically generated by `json-autotype`. */ +#include #include #include @@ -78,28 +79,6 @@ int neu_json_decode_group_configs_req(char * buf, p_datatag_name++; } - // req->n_datatag_name = neu_json_decode_array_size(buf, "datatag_names"); - // req->datatag_names = calloc( - // req->n_datatag_name, - // sizeof(neu_json_group_configs_req_datatag_name_t)); - // neu_json_group_configs_req_datatag_name_t *p_datatag_name = - // req->datatag_names; - // for (int i = 0; i < req->n_datatag_name; i++) { - // neu_json_elem_t datatag_name_elems[] = { { - // .name = NULL, - // .t = NEU_JSON_STR, - // } }; - // ret = neu_json_decode_array(buf, "datatag_names", i, - // NEU_JSON_ELEM_SIZE(datatag_name_elems), - // datatag_name_elems); - // if (ret != 0) { - // goto decode_fail; - // } - - // *p_datatag_name = datatag_name_elems[0].v.val_str; - // p_datatag_name++; - // } - *result = req; return ret; @@ -126,12 +105,6 @@ void neu_json_decode_group_configs_req_free(neu_json_group_configs_req_t *req) p_datatag_name++; } - // neu_json_group_configs_req_datatag_name_t *p_datatag_name = - // req->datatag_names; for (int i = 0; i < req->n_datatag_name; i++) { - // free(p_datatag_name->); - // p_datatag_name++; - // } - free(req->group_config_name); free(req->datatag_names); free(req->adapter_name); @@ -141,22 +114,23 @@ void neu_json_decode_group_configs_req_free(neu_json_group_configs_req_t *req) int neu_json_encode_group_configs_resp(void *json_object, void *param) { - int ret = 0; + int ret = 0; + neu_json_group_configs_resp_t *resp = (neu_json_group_configs_resp_t *) param; + void *datatag_name_array = json_array(); - void * datatag_name_array = NULL; neu_json_group_configs_resp_datatag_name_t *p_datatag_names = resp->datatag_names; for (int i = 0; i < resp->n_datatag_name; i++) { - neu_json_elem_t datatag_name_elems[] = { { + neu_json_elem_t datatag_name_elems = { .name = NULL, .t = NEU_JSON_STR, .v.val_str = *p_datatag_names, - } }; - datatag_name_array = - neu_json_encode_array(datatag_name_array, datatag_name_elems, - NEU_JSON_ELEM_SIZE(datatag_name_elems)); + }; + + datatag_name_array = neu_json_encode_array_value( + datatag_name_array, &datatag_name_elems, 1); p_datatag_names++; }