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 <jon.maloy@ericsson.com>
Acked-by: Jon Maloy <jon.maloy@ericsson.com>
Signed-off-by: Hoang Le <hoang.h.le@dektech.com.au>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>

diff --git a/tipc/nametable.c b/tipc/nametable.c
index eb4bd0bda83583bd44ac8134996f25fc1ef5b093..d899eeb67c07dcf0edd2d32410b7d0c6413b3f1d 100644 (file)
--- 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();