diff options
author | Phil Sutter <phil@nwl.cc> | 2018-08-29 16:23:25 +0200 |
---|---|---|
committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2018-08-30 12:19:36 +0200 |
commit | 665da8df3cfaf482157b752f5de98c45038621c3 (patch) | |
tree | 2e24a645694a8b0c06ff1adfbc2b6165fae4f5b8 /src | |
parent | dfd72398d44ebbe17929d6e8ca0c870087a0c644 (diff) |
JSON: Rename (v)map expression properties
Change the rather generic "left" and "right" into "key" and "data" as
suggested at NFWS.
Signed-off-by: Phil Sutter <phil@nwl.cc>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'src')
-rw-r--r-- | src/json.c | 4 | ||||
-rw-r--r-- | src/parser_json.c | 22 |
2 files changed, 13 insertions, 13 deletions
@@ -563,8 +563,8 @@ json_t *map_expr_json(const struct expr *expr, struct output_ctx *octx) type = "vmap"; return json_pack("{s:{s:o, s:o}}", type, - "left", expr_print_json(expr->map, octx), - "right", expr_print_json(expr->mappings, octx)); + "key", expr_print_json(expr->map, octx), + "data", expr_print_json(expr->mappings, octx)); } json_t *exthdr_expr_json(const struct expr *expr, struct output_ctx *octx) diff --git a/src/parser_json.c b/src/parser_json.c index 7dd621d8..1bb4f1f1 100644 --- a/src/parser_json.c +++ b/src/parser_json.c @@ -1117,27 +1117,27 @@ static struct expr *json_parse_set_expr(struct json_ctx *ctx, static struct expr *json_parse_map_expr(struct json_ctx *ctx, const char *type, json_t *root) { - json_t *jleft, *jright; - struct expr *left, *right; + json_t *jkey, *jdata; + struct expr *key, *data; if (json_unpack_err(ctx, root, "{s:o, s:o}", - "left", &jleft, "right", &jright)) + "key", &jkey, "data", &jdata)) return NULL; - left = json_parse_map_lhs_expr(ctx, jleft); - if (!left) { - json_error(ctx, "Illegal LHS of map expression."); + key = json_parse_map_lhs_expr(ctx, jkey); + if (!key) { + json_error(ctx, "Illegal map expression key."); return NULL; } - right = json_parse_rhs_expr(ctx, jright); - if (!right) { - json_error(ctx, "Illegal RHS of map expression."); - expr_free(left); + data = json_parse_rhs_expr(ctx, jdata); + if (!data) { + json_error(ctx, "Illegal map expression data."); + expr_free(key); return NULL; } - return map_expr_alloc(int_loc, left, right); + return map_expr_alloc(int_loc, key, data); } static struct expr *json_parse_set_elem_expr(struct json_ctx *ctx, |