From: Aya Levin Date: Wed, 10 Jul 2019 11:03:21 +0000 (+0300) Subject: devlink: Remove enclosing array brackets binary print with json format X-Git-Tag: v5.3.0~42 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f359942a25d368ccf2e47b79f95db2798e09f7a4;p=thirdparty%2Fiproute2.git devlink: Remove enclosing array brackets binary print with json format Keep pr_out_binary_value function only for printing. Inner relations like array grouping should be done outside the function. Fixes: 844a61764c6f ("devlink: Add helper functions for name and value separately") Signed-off-by: Aya Levin Signed-off-by: Tariq Toukan Signed-off-by: Stephen Hemminger --- diff --git a/devlink/devlink.c b/devlink/devlink.c index 6b28138d5..bb023c0c2 100644 --- a/devlink/devlink.c +++ b/devlink/devlink.c @@ -1788,9 +1788,6 @@ static void pr_out_binary_value(struct dl *dl, uint8_t *data, uint32_t len) { int i = 0; - if (dl->json_output) - jsonw_start_array(dl->jw); - while (i < len) { if (dl->json_output) jsonw_printf(dl->jw, "%d", data[i]); @@ -1800,9 +1797,7 @@ static void pr_out_binary_value(struct dl *dl, uint8_t *data, uint32_t len) if (!dl->json_output && is_binary_eol(i)) __pr_out_newline(); } - if (dl->json_output) - jsonw_end_array(dl->jw); - else if (!is_binary_eol(i)) + if (!dl->json_output && !is_binary_eol(i)) __pr_out_newline(); }