From: Stephen Bates Date: Fri, 13 Mar 2015 15:45:44 +0000 (-0600) Subject: Improved text display for nvme list command. X-Git-Tag: v0.1~54 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=5b10a206737a6ec9067ae9844831a6030dd8f05b;p=users%2Fsagi%2Fnvme-cli.git Improved text display for nvme list command. --- diff --git a/nvme.c b/nvme.c index 9c0afa56..0af14d08 100644 --- a/nvme.c +++ b/nvme.c @@ -775,24 +775,24 @@ static void print_list_item(struct list_item list_item) const char *l_suffix = suffix_binary_get(&lba); char usage[128]; - sprintf(usage,"%3.2f %sB / %3.1f %sB", nuse, u_suffix, + sprintf(usage,"%6.2f %2sB / %6.2f %2sB", nuse, u_suffix, nsze, s_suffix); char format[128]; - sprintf(format,"%.0f %sB + %d B", (double)lba, l_suffix, + sprintf(format,"%3.0f %2sB + %2d B", (double)lba, l_suffix, list_item.ns.lbaf[list_item.ns.flbas].ms); char version[128]; sprintf(version,"%d.%d", (list_item.ctrl.ver >> 16), (list_item.ctrl.ver >> 8) & 0xff); - fprintf(stdout, "%-8s\t%-.20s\t%-8s\t%-8d\t%-26s\t%-.10s\n", list_item.node, + fprintf(stdout, "%-8s\t%-.20s\t%-8s\t%-8d\t%-26s\t%-.16s\n", list_item.node, list_item.ctrl.mn, version, list_item.nsid, usage, format); } static void print_list_items(struct list_item *list_items, unsigned len) { - fprintf(stdout,"%-8s\t%-20s\t%-8s\t%-8s\t%-26s\t%-10s\n", + fprintf(stdout,"%-8s\t%-20s\t%-8s\t%-8s\t%-26s\t%-16s\n", "Node","Vendor","Version","Namepace", "Usage", "Format"); - fprintf(stdout,"%-8s\t%-20s\t%-8s\t%-8s\t%-26s\t%-10s\n", + fprintf(stdout,"%-8s\t%-20s\t%-8s\t%-8s\t%-26s\t%-16s\n", "----","------","-------","--------","------","-------"); for (unsigned i=0 ; i