From: Tokunori Ikegami <ikegami.t@gmail.com>
Date: Wed, 20 Oct 2021 16:32:13 +0000 (+0900)
Subject: nvme: Fix to print get and set feature hex digits correct width
X-Git-Tag: v2.0-rc0~65^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=4c7b19a1f62736e0eb501cb8780caf1377c99e14;p=users%2Fsagi%2Fnvme-cli.git

nvme: Fix to print get and set feature hex digits correct width

Previously 2 hex digits not printed as "0x" was included the width specified.
To resolve this increase 2 digits number more if the value is not zero.

Signed-off-by: Tokunori Ikegami <ikegami.t@gmail.com>
---

diff --git a/nvme.c b/nvme.c
index d654493d..883f14a7 100644
--- a/nvme.c
+++ b/nvme.c
@@ -2811,9 +2811,11 @@ static int get_feature(int argc, char **argv, struct command *cmd, struct plugin
 				buf, &result);
 	if (!err) {
 		if (!cfg.raw_binary || !buf) {
-			printf("get-feature:%#02x (%s), %s value:%#08x\n", cfg.feature_id,
-				nvme_feature_to_string(cfg.feature_id),
-				nvme_select_to_string(cfg.sel), result);
+			printf("get-feature:%#0*x (%s), %s value:%#0*x\n",
+			       cfg.feature_id ? 4 : 2, cfg.feature_id,
+			       nvme_feature_to_string(cfg.feature_id),
+			       nvme_select_to_string(cfg.sel), result ? 10 : 8,
+			       result);
 			if (cfg.sel == 3)
 				nvme_show_select_result(result);
 			else if (cfg.human_readable)
@@ -3840,9 +3842,11 @@ static int set_feature(int argc, char **argv, struct command *cmd, struct plugin
 	if (err < 0) {
 		perror("set-feature");
 	} else if (!err) {
-		printf("set-feature:%#02x (%s), value:%#08"PRIx64", cdw12:%#08"PRIx32", \
-			save:%#x\n", cfg.feature_id, nvme_feature_to_string(cfg.feature_id),
-			(uint64_t)cfg.value, cfg.cdw12, cfg.save);
+		printf("set-feature:%#0*x (%s), value:%#0*"PRIx64", cdw12:%#0*x, save:%#x\n",
+		       cfg.feature_id ? 4 : 2, cfg.feature_id,
+		       nvme_feature_to_string(cfg.feature_id),
+		       cfg.value ? 10 : 8, (uint64_t)cfg.value,
+		       cfg.cdw12 ? 10 : 8, cfg.cdw12, cfg.save);
 		if (cfg.feature_id == NVME_FEAT_FID_LBA_STS_INTERVAL) {
 			nvme_show_lba_status_info(result);
 		}