From: Aya Levin <a...@mellanox.com> 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 <a...@mellanox.com> Signed-off-by: Tariq Toukan <tar...@mellanox.com> --- devlink/devlink.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/devlink/devlink.c b/devlink/devlink.c index 4bced4e60ae8..7532c3f888f9 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(); } -- 1.8.3.1