From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Hemminger Subject: Re: [PATCH iproute2] bridge/mdb: fix missing new line when show bridge mdb Date: Thu, 6 Sep 2018 14:00:53 +0100 Message-ID: <20180906140053.0778cee3@shemminger-XPS-13-9360> References: <1536118423-20604-1-git-send-email-liuhangbin@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Cc: netdev@vger.kernel.org, David Ahern To: Hangbin Liu Return-path: Received: from mail-wr1-f68.google.com ([209.85.221.68]:44123 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727700AbeIFRgW (ORCPT ); Thu, 6 Sep 2018 13:36:22 -0400 Received: by mail-wr1-f68.google.com with SMTP id v16-v6so11278820wro.11 for ; Thu, 06 Sep 2018 06:00:58 -0700 (PDT) In-Reply-To: <1536118423-20604-1-git-send-email-liuhangbin@gmail.com> Sender: netdev-owner@vger.kernel.org List-ID: On Wed, 5 Sep 2018 11:33:43 +0800 Hangbin Liu wrote: > The bridge mdb show is broken on current iproute2. e.g. > ]# bridge mdb show > 34: br0 veth0_br 224.1.1.2 temp 34: br0 veth0_br 224.1.1.1 temp > > After fix: > ]# bridge mdb show > 34: br0 veth0_br 224.1.1.2 temp > 34: br0 veth0_br 224.1.1.1 temp > > Reported-by: Ying Xu > Fixes: c7c1a1ef51aea ("bridge: colorize output and use JSON print library") > Signed-off-by: Hangbin Liu > --- > bridge/mdb.c | 8 ++++++++ > 1 file changed, 8 insertions(+) > > diff --git a/bridge/mdb.c b/bridge/mdb.c > index f38dc67..d89c065 100644 > --- a/bridge/mdb.c > +++ b/bridge/mdb.c > @@ -107,6 +107,10 @@ static void br_print_router_ports(FILE *f, struct rtattr *attr, > fprintf(f, "%s ", port_ifname); > } > } > + > + if (!is_json_context() && !show_stats) > + fprintf(f, "\n"); > + > close_json_array(PRINT_JSON, NULL); > } > > @@ -164,6 +168,10 @@ static void print_mdb_entry(FILE *f, int ifindex, const struct br_mdb_entry *e, > print_string(PRINT_ANY, "timer", " %s", > format_timer(timer)); > } > + > + if (!is_json_context()) > + fprintf(f, "\n"); > + > close_json_object(); > } > Thanks for catching this. Now that there is a json print library, the preferred pattern for this is: print_string(PRINT_FP, NULL, "\n", NULL); I plan to introduce a helper print_fp(...) and it would be easier if all places were consistent.