From: Tokunori Ikegami <ikegami.t@gmail.com>
Date: Mon, 4 Mar 2024 15:06:50 +0000 (+0900)
Subject: nvme-print-json, nvme-print-stdout: Use CHAR_BIT definition
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=6154ddb725d9c20e3778d6a193ebc7e9ba69e852;p=users%2Fsagi%2Fnvme-cli.git

nvme-print-json, nvme-print-stdout: Use CHAR_BIT definition

Instead of the hardcoded value use the macro definition.

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

diff --git a/nvme-print-json.c b/nvme-print-json.c
index bbde295c..ced48430 100644
--- a/nvme-print-json.c
+++ b/nvme-print-json.c
@@ -1430,12 +1430,12 @@ static void json_add_bitmap(int i, __u8 seb, struct json_object *r)
 	char evt_str[50];
 	char key[128];
 
-	for (int bit = 0; bit < 8; bit++) {
-		if (nvme_pel_event_to_string(bit + i * 8)) {
-			sprintf(key, "bitmap_%x", (bit + i * 8));
+	for (int bit = 0; bit < CHAR_BIT; bit++) {
+		if (nvme_pel_event_to_string(bit + i * CHAR_BIT)) {
+			sprintf(key, "bitmap_%x", (bit + i * CHAR_BIT));
 			if ((seb >> bit) & 0x1)
 				snprintf(evt_str, sizeof(evt_str), "Support %s",
-					 nvme_pel_event_to_string(bit + i * 8));
+					 nvme_pel_event_to_string(bit + i * CHAR_BIT));
 			obj_add_str(r, key, evt_str);
 		}
 	}
diff --git a/nvme-print-stdout.c b/nvme-print-stdout.c
index 46eb562c..a217983c 100644
--- a/nvme-print-stdout.c
+++ b/nvme-print-stdout.c
@@ -247,11 +247,11 @@ static void stdout_persistent_event_entry_ehai(__u8 ehai)
 
 static void stdout_add_bitmap(int i, __u8 seb)
 {
-	for (int bit = 0; bit < 8; bit++) {
-		if (nvme_pel_event_to_string(bit + i * 8)) {
+	for (int bit = 0; bit < CHAR_BIT; bit++) {
+		if (nvme_pel_event_to_string(bit + i * CHAR_BIT)) {
 			if ((seb >> bit) & 0x1)
 				printf("	Support %s\n",
-				       nvme_pel_event_to_string(bit + i * 8));
+				       nvme_pel_event_to_string(bit + i * CHAR_BIT));
 		}
 	}
 }