I didn't test this, but trust its ok. Acked-by: Jon Maloy <[email protected]>
> -----Original Message----- > From: Hoang Le <[email protected]> > Sent: 4-Dec-18 23:33 > To: [email protected]; Jon Maloy > <[email protected]>; [email protected]; [email protected] > Subject: [iproute2-next] tipc: fix misalignment printout in non-JSON output > > In the commit 1304f50a5be0ed ("tipc: JSON support for showing > nametable"), introduced misalignment in the columns of the printout in non- > JSON mode compare to the list header. Add one space per column to make > alignment with the list header. > > before: > $tipc name show > Type Lower Upper Scope Port Node > 1 1 1 node 4071367628 > > after: > $tipc name show > Type Lower Upper Scope Port Node > 1 1 1 node 4071367628 > > Reported-by: Jon Maloy <[email protected]> > Signed-off-by: Hoang Le <[email protected]> > --- > tipc/nametable.c | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/tipc/nametable.c b/tipc/nametable.c index > eb4bd0bda835..d899eeb67c07 100644 > --- a/tipc/nametable.c > +++ b/tipc/nametable.c > @@ -58,14 +58,19 @@ static int nametable_show_cb(const struct nlmsghdr > *nlh, void *data) > open_json_object(NULL); > print_uint(PRINT_ANY, "type", "%-10u", > mnl_attr_get_u32(publ[TIPC_NLA_PUBL_TYPE])); > + print_string(PRINT_FP, NULL, " ", ""); > print_uint(PRINT_ANY, "lower", "%-10u", > > mnl_attr_get_u32(publ[TIPC_NLA_PUBL_LOWER])); > + print_string(PRINT_FP, NULL, " ", ""); > print_uint(PRINT_ANY, "upper", "%-10u", > mnl_attr_get_u32(publ[TIPC_NLA_PUBL_UPPER])); > + print_string(PRINT_FP, NULL, " ", ""); > print_string(PRINT_ANY, "scope", "%-8s", > > scope[mnl_attr_get_u32(publ[TIPC_NLA_PUBL_SCOPE])]); > + print_string(PRINT_FP, NULL, " ", ""); > print_uint(PRINT_ANY, "port", "%-10u", > mnl_attr_get_u32(publ[TIPC_NLA_PUBL_REF])); > + print_string(PRINT_FP, NULL, " ", ""); > print_string(PRINT_ANY, "node", "%s", str); > print_string(PRINT_FP, NULL, "\n", ""); > close_json_object(); > -- > 2.17.1 _______________________________________________ tipc-discussion mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/tipc-discussion
