proxmox-mirrors/mirror_iproute2
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_iproute2 synced 2025-10-06 05:14:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

devlink: Remove enclosing array brackets binary print with json format

Browse Source 
Keep pr_out_binary_value function only for printing. Inner relations
like array grouping should be done outside the function.

Fixes: 844a61764c ("devlink: Add helper functions for name and value separately")
Signed-off-by: Aya Levin <ayal@mellanox.com>
Signed-off-by: Tariq Toukan <tariqt@mellanox.com>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
This commit is contained in:
Aya Levin 2019-07-10 14:03:21 +03:00 committed by Stephen Hemminger
parent 1d05cca2fd
commit f359942a25
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
devlink/devlink.c
View File

@ -1788,9 +1788,6 @@ static void pr_out_binary_value(struct dl *dl, uint8_t *data, uint32_t len)
{ {
int i = 0; int i = 0;
if (dl->json_output)
jsonw_start_array(dl->jw);
while (i < len) { while (i < len) {
if (dl->json_output) if (dl->json_output)
jsonw_printf(dl->jw, "%d", data[i]); 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)) if (!dl->json_output && is_binary_eol(i))
__pr_out_newline(); __pr_out_newline();
} }
if (dl->json_output) if (!dl->json_output && !is_binary_eol(i))
jsonw_end_array(dl->jw);
else if (!is_binary_eol(i))
__pr_out_newline(); __pr_out_newline();
} }