proxmox-mirrors/mirror_iproute2
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_iproute2 synced 2026-01-27 07:49:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

tipc: fix misalignment printout in non-JSON output

Browse Source 
In the commit 1304f50a5b ("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>
This commit is contained in:
Hoang Le 2018-12-06 08:40:06 +07:00 committed by Stephen Hemminger
parent 2e320d8b7e
commit 853adffe13
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tipc/nametable.c
View File

@ -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();