diff options
| author | Katharina Fey <kookie@spacekookie.de> | 2016-08-28 14:06:22 +0200 |
|---|---|---|
| committer | Katharina Fey <kookie@spacekookie.de> | 2019-06-04 20:21:03 +0200 |
| commit | 75481c8cb77067cda4c9fb6499d72764f7e84a24 (patch) | |
| tree | 40aba2846c55b001417a22389a1d9b5eea4547c7 /lib/dyn_utils.c | |
| parent | bcf48a0e4bd5bbf97c22cf9f7c9494b54d1f22ff (diff) | |
Fixing some errors and finishing more refactoring
Diffstat (limited to 'lib/dyn_utils.c')
| -rw-r--r-- | lib/dyn_utils.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/lib/dyn_utils.c b/lib/dyn_utils.c index 055623b..c6e5ac0 100644 --- a/lib/dyn_utils.c +++ b/lib/dyn_utils.c @@ -82,11 +82,11 @@ dt_err dtree_encode_json(dtree *data, char *json_data) /* Iterate through all it's children */ int i; for(i = 0; i < data->used; i++) { - dtree *child = data->payload.recursive[i]; + dtree *child = data->payload.list[i]; if(child->type == PAIR) { - dtree *key = child->payload.recursive[0]; - dtree *val = child->payload.recursive[1]; + dtree *key = child->payload.list[0]; + dtree *val = child->payload.list[1]; char kkey[1024]; parse_key_value(key, kkey, mode);; @@ -186,7 +186,7 @@ dt_err dtree_decode_json(dtree *(*data), const char *jd) { if(in_str) { } else { - if(curr_key[0] != NULL) { + if(curr_key[0] != '\0') { dtree *key, *val; dtree *rec_entry; @@ -358,14 +358,14 @@ const char *parse_value_list(dtree *value, char *buffer, char *global, short mod { if(value->used > 0) { - dt_uni_t test = value->payload.recursive[0]->type; + dt_uni_t test = value->payload.list[0]->type; if(test == LITERAL || test == NUMERIC) { fflush(stdout); int j; for(j = 0; j < value->used; j++) { - dtree *child = value->payload.recursive[j]; + dtree *child = value->payload.list[j]; char vall[1024]; parse_value_list(child, vall, global, mode, depth + 1, (i == value->used - 1) ? TRUE : FALSE); @@ -381,11 +381,11 @@ const char *parse_value_list(dtree *value, char *buffer, char *global, short mod int j; for(j = 0; j < value->used; j++) { - dtree *child = value->payload.recursive[j]; + dtree *child = value->payload.list[j]; if(child->type == PAIR) { - dtree *key = child->payload.recursive[0]; - dtree *val = child->payload.recursive[1]; + dtree *key = child->payload.list[0]; + dtree *val = child->payload.list[1]; char kkey[1024]; |