From 8f6e1c37e3e74e1fd490a0de5360ff1467c521cd Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Wed, 29 Aug 2018 16:23:26 +0200 Subject: JSON: Rename mangle statement properties Instead of the generic "left" and "right", use "key" and "value". Signed-off-by: Phil Sutter Signed-off-by: Pablo Neira Ayuso --- src/json.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/json.c') diff --git a/src/json.c b/src/json.c index 1b596897..4af8ee8e 100644 --- a/src/json.c +++ b/src/json.c @@ -929,15 +929,15 @@ json_t *expr_stmt_json(const struct stmt *stmt, struct output_ctx *octx) json_t *payload_stmt_json(const struct stmt *stmt, struct output_ctx *octx) { return json_pack("{s: {s:o, s:o}}", "mangle", - "left", expr_print_json(stmt->payload.expr, octx), - "right", expr_print_json(stmt->payload.val, octx)); + "key", expr_print_json(stmt->payload.expr, octx), + "value", expr_print_json(stmt->payload.val, octx)); } json_t *exthdr_stmt_json(const struct stmt *stmt, struct output_ctx *octx) { return json_pack("{s: {s:o, s:o}}", "mangle", - "left", expr_print_json(stmt->exthdr.expr, octx), - "right", expr_print_json(stmt->exthdr.val, octx)); + "key", expr_print_json(stmt->exthdr.expr, octx), + "value", expr_print_json(stmt->exthdr.val, octx)); } json_t *quota_stmt_json(const struct stmt *stmt, struct output_ctx *octx) @@ -973,8 +973,8 @@ json_t *ct_stmt_json(const struct stmt *stmt, struct output_ctx *octx) }; return json_pack("{s:{s:o, s:o}}", "mangle", - "left", ct_expr_json(&expr, octx), - "right", expr_print_json(stmt->ct.expr, octx)); + "key", ct_expr_json(&expr, octx), + "value", expr_print_json(stmt->ct.expr, octx)); } json_t *limit_stmt_json(const struct stmt *stmt, struct output_ctx *octx) @@ -1051,8 +1051,8 @@ json_t *meta_stmt_json(const struct stmt *stmt, struct output_ctx *octx) root = json_pack("{s:{s:s}}", "meta", "key", meta_templates[stmt->meta.key].token); root = json_pack("{s:o, s:o}", - "left", root, - "right", expr_print_json(stmt->meta.expr, octx)); + "key", root, + "value", expr_print_json(stmt->meta.expr, octx)); return json_pack("{s:o}", "mangle", root); } -- cgit v1.2.3