48 lines
1.5 KiB
Diff
48 lines
1.5 KiB
Diff
From a5d73c80107321aafd1e2007a059a7eb950412d7 Mon Sep 17 00:00:00 2001
|
|
From: Aya Levin <ayal@mellanox.com>
|
|
Date: Wed, 10 Jul 2019 14:03:21 +0300
|
|
Subject: [PATCH] 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 <ayal@mellanox.com>
|
|
Signed-off-by: Tariq Toukan <tariqt@mellanox.com>
|
|
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
|
|
(cherry picked from commit f359942a25d368ccf2e47b79f95db2798e09f7a4)
|
|
Signed-off-by: Phil Sutter <psutter@redhat.com>
|
|
---
|
|
devlink/devlink.c | 7 +------
|
|
1 file changed, 1 insertion(+), 6 deletions(-)
|
|
|
|
diff --git a/devlink/devlink.c b/devlink/devlink.c
|
|
index 5dff974c93c93..ebb1de3eb2eaa 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();
|
|
}
|
|
|
|
--
|
|
2.22.0
|
|
|