From mboxrd@z Thu Jan 1 00:00:00 1970 From: Arkadi Sharshevsky Subject: [PATCH iproute2 1/7] devlink: Change empty line indication with indentations Date: Wed, 14 Feb 2018 10:55:16 +0200 Message-ID: <1518598522-27713-2-git-send-email-arkadis@mellanox.com> References: <1518598522-27713-1-git-send-email-arkadis@mellanox.com> Mime-Version: 1.0 Content-Type: text/plain Cc: davem@davemloft.net, stephen@networkplumber.org, dsa@cumulusnetworks.com, mlxsw@mellanox.com, Arkadi Sharshevsky To: netdev@vger.kernel.org Return-path: Received: from mail-db5eur01on0059.outbound.protection.outlook.com ([104.47.2.59]:51587 "EHLO EUR01-DB5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S934850AbeBNIzo (ORCPT ); Wed, 14 Feb 2018 03:55:44 -0500 In-Reply-To: <1518598522-27713-1-git-send-email-arkadis@mellanox.com> Sender: netdev-owner@vger.kernel.org List-ID: Currently multi-line objects are separated by new-lines. This patch changes this behavior by using indentations for separation. Signed-off-by: Arkadi Sharhsevsky Acked-by: Jiri Pirko --- devlink/devlink.c | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/devlink/devlink.c b/devlink/devlink.c index 57e71ac..8ef6041 100644 --- a/devlink/devlink.c +++ b/devlink/devlink.c @@ -35,6 +35,8 @@ #define ESWITCH_INLINE_MODE_NETWORK "network" #define ESWITCH_INLINE_MODE_TRANSPORT "transport" +static int g_new_line_count; + #define pr_err(args...) fprintf(stderr, ##args) #define pr_out(args...) \ do { \ @@ -43,6 +45,7 @@ g_indent_newline = false; \ } \ fprintf(stdout, ##args); \ + g_new_line_count = 0; \ } while (0) #define pr_out_sp(num, args...) \ @@ -50,6 +53,7 @@ int ret = fprintf(stdout, ##args); \ if (ret < num) \ fprintf(stdout, "%*s", num - ret, ""); \ + g_new_line_count = 0; \ } while (0) static int g_indent_level; @@ -77,8 +81,11 @@ static void __pr_out_indent_dec(void) static void __pr_out_newline(void) { - pr_out("\n"); - g_indent_newline = true; + if (g_new_line_count < 1) { + pr_out("\n"); + g_indent_newline = true; + } + g_new_line_count++; } static int _mnlg_socket_recv_run(struct mnlg_socket *nlg, @@ -1401,20 +1408,22 @@ static void pr_out_array_start(struct dl *dl, const char *name) jsonw_name(dl->jw, name); jsonw_start_array(dl->jw); } else { - if (!g_indent_newline) - __pr_out_newline(); - pr_out("%s:", name); + __pr_out_indent_inc(); __pr_out_newline(); + pr_out("%s:", name); __pr_out_indent_inc(); + __pr_out_newline(); } } static void pr_out_array_end(struct dl *dl) { - if (dl->json_output) + if (dl->json_output) { jsonw_end_array(dl->jw); - else + } else { + __pr_out_indent_dec(); __pr_out_indent_dec(); + } } static void pr_out_entry_start(struct dl *dl) -- 2.4.11