Skip to content

Commit 6154ddb

Browse files
ikegami-tigaw
authored andcommitted
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>
1 parent 79e7121 commit 6154ddb

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

nvme-print-json.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -1430,12 +1430,12 @@ static void json_add_bitmap(int i, __u8 seb, struct json_object *r)
14301430
char evt_str[50];
14311431
char key[128];
14321432

1433-
for (int bit = 0; bit < 8; bit++) {
1434-
if (nvme_pel_event_to_string(bit + i * 8)) {
1435-
sprintf(key, "bitmap_%x", (bit + i * 8));
1433+
for (int bit = 0; bit < CHAR_BIT; bit++) {
1434+
if (nvme_pel_event_to_string(bit + i * CHAR_BIT)) {
1435+
sprintf(key, "bitmap_%x", (bit + i * CHAR_BIT));
14361436
if ((seb >> bit) & 0x1)
14371437
snprintf(evt_str, sizeof(evt_str), "Support %s",
1438-
nvme_pel_event_to_string(bit + i * 8));
1438+
nvme_pel_event_to_string(bit + i * CHAR_BIT));
14391439
obj_add_str(r, key, evt_str);
14401440
}
14411441
}

nvme-print-stdout.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -247,11 +247,11 @@ static void stdout_persistent_event_entry_ehai(__u8 ehai)
247247

248248
static void stdout_add_bitmap(int i, __u8 seb)
249249
{
250-
for (int bit = 0; bit < 8; bit++) {
251-
if (nvme_pel_event_to_string(bit + i * 8)) {
250+
for (int bit = 0; bit < CHAR_BIT; bit++) {
251+
if (nvme_pel_event_to_string(bit + i * CHAR_BIT)) {
252252
if ((seb >> bit) & 0x1)
253253
printf(" Support %s\n",
254-
nvme_pel_event_to_string(bit + i * 8));
254+
nvme_pel_event_to_string(bit + i * CHAR_BIT));
255255
}
256256
}
257257
}

0 commit comments

Comments
 (0)