From mboxrd@z Thu Jan 1 00:00:00 1970 From: Roman Mashak Subject: [PATCH iproute2-next 1/1] tc: support oneline mode in action generic printer functions Date: Sat, 31 Mar 2018 00:16:45 -0400 Message-ID: <1522469805-20584-1-git-send-email-mrv@mojatatu.com> Cc: stephen@networkplumber.org, netdev@vger.kernel.org, kernel@mojatatu.com, jhs@mojatatu.com, xiyou.wangcong@gmail.com, jiri@resnulli.us, Roman Mashak To: dsahern@gmail.com Return-path: Received: from mail-it0-f65.google.com ([209.85.214.65]:39684 "EHLO mail-it0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751476AbeCaEQx (ORCPT ); Sat, 31 Mar 2018 00:16:53 -0400 Received: by mail-it0-f65.google.com with SMTP id e98-v6so13145570itd.4 for ; Fri, 30 Mar 2018 21:16:53 -0700 (PDT) Sender: netdev-owner@vger.kernel.org List-ID: Signed-off-by: Roman Mashak --- tc/m_action.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/tc/m_action.c b/tc/m_action.c index 8891659ae15a..2f85d353279a 100644 --- a/tc/m_action.c +++ b/tc/m_action.c @@ -301,19 +301,21 @@ static int tc_print_one_action(FILE *f, struct rtattr *arg) return err; if (show_stats && tb[TCA_ACT_STATS]) { - print_string(PRINT_FP, NULL, "\tAction statistics:\n", NULL); + print_string(PRINT_FP, NULL, "\tAction statistics:", NULL); + print_string(PRINT_FP, NULL, "%s", _SL_); open_json_object("stats"); print_tcstats2_attr(f, tb[TCA_ACT_STATS], "\t", NULL); close_json_object(); - print_string(PRINT_FP, NULL, "\n", NULL); + print_string(PRINT_FP, NULL, "%s", _SL_); } if (tb[TCA_ACT_COOKIE]) { int strsz = RTA_PAYLOAD(tb[TCA_ACT_COOKIE]); char b1[strsz * 2 + 1]; - print_string(PRINT_ANY, "cookie", "\tcookie %s\n", + print_string(PRINT_ANY, "cookie", "\tcookie %s", hexstring_n2a(RTA_DATA(tb[TCA_ACT_COOKIE]), strsz, b1, sizeof(b1))); + print_string(PRINT_FP, NULL, "%s", _SL_); } return 0; @@ -369,8 +371,9 @@ tc_print_action(FILE *f, const struct rtattr *arg, unsigned short tot_acts) for (i = 0; i <= tot_acts; i++) { if (tb[i]) { open_json_object(NULL); + print_string(PRINT_FP, NULL, "%s", _SL_); print_uint(PRINT_ANY, "order", - "\n\taction order %u: ", i); + "\taction order %u: ", i); if (tc_print_one_action(f, tb[i]) < 0) { print_string(PRINT_FP, NULL, "Error printing action\n", NULL); @@ -410,6 +413,7 @@ int print_action(const struct sockaddr_nl *who, open_json_object(NULL); print_uint(PRINT_ANY, "total acts", "total acts %u", tot_acts ? *tot_acts : 0); + print_string(PRINT_FP, NULL, "%s", _SL_); close_json_object(); if (tb[TCA_ACT_TAB] == NULL) { if (n->nlmsg_type != RTM_GETACTION) -- 2.7.4