|
 |
dfabe0 |
From da06888d08b9f1108fe89560c06d39675c10cd95 Mon Sep 17 00:00:00 2001
|
|
|
dfabe0 |
From: Jean Delvare <jdelvare@suse.de>
|
|
|
dfabe0 |
Date: Wed, 1 Apr 2020 10:00:30 +0200
|
|
|
dfabe0 |
Subject: [PATCH 17/23] dmidecode: Use the print helpers in dump mode too
|
|
|
dfabe0 |
|
|
|
dfabe0 |
Signed-off-by: Jean Delvare <jdelvare@suse.de>
|
|
|
dfabe0 |
---
|
|
|
dfabe0 |
dmidecode.c | 30 ++++++++++++++++++------------
|
|
|
dfabe0 |
1 file changed, 18 insertions(+), 12 deletions(-)
|
|
|
dfabe0 |
|
|
|
dfabe0 |
diff --git a/dmidecode.c b/dmidecode.c
|
|
|
dfabe0 |
index 3d1da955bab8..5e9b9899ec1f 100644
|
|
|
dfabe0 |
--- a/dmidecode.c
|
|
|
dfabe0 |
+++ b/dmidecode.c
|
|
|
dfabe0 |
@@ -220,43 +220,49 @@ static int dmi_bcd_range(u8 value, u8 low, u8 high)
|
|
|
dfabe0 |
return 1;
|
|
|
dfabe0 |
}
|
|
|
dfabe0 |
|
|
|
dfabe0 |
-static void dmi_dump(const struct dmi_header *h, const char *prefix)
|
|
|
dfabe0 |
+static void dmi_dump(const struct dmi_header *h)
|
|
|
dfabe0 |
{
|
|
|
dfabe0 |
+ static char raw_data[48];
|
|
|
dfabe0 |
int row, i;
|
|
|
dfabe0 |
+ unsigned int off;
|
|
|
dfabe0 |
char *s;
|
|
|
dfabe0 |
|
|
|
dfabe0 |
- printf("%sHeader and Data:\n", prefix);
|
|
|
dfabe0 |
+ pr_list_start("Header and Data", NULL);
|
|
|
dfabe0 |
for (row = 0; row < ((h->length - 1) >> 4) + 1; row++)
|
|
|
dfabe0 |
{
|
|
|
dfabe0 |
- printf("%s\t", prefix);
|
|
|
dfabe0 |
+ off = 0;
|
|
|
dfabe0 |
for (i = 0; i < 16 && i < h->length - (row << 4); i++)
|
|
|
dfabe0 |
- printf("%s%02X", i ? " " : "",
|
|
|
dfabe0 |
+ off += sprintf(raw_data + off, i ? " %02X" : "%02X",
|
|
|
dfabe0 |
(h->data)[(row << 4) + i]);
|
|
|
dfabe0 |
- printf("\n");
|
|
|
dfabe0 |
+ pr_list_item(raw_data);
|
|
|
dfabe0 |
}
|
|
|
dfabe0 |
+ pr_list_end();
|
|
|
dfabe0 |
|
|
|
dfabe0 |
if ((h->data)[h->length] || (h->data)[h->length + 1])
|
|
|
dfabe0 |
{
|
|
|
dfabe0 |
- printf("%sStrings:\n", prefix);
|
|
|
dfabe0 |
+ pr_list_start("Strings", NULL);
|
|
|
dfabe0 |
i = 1;
|
|
|
dfabe0 |
while ((s = _dmi_string(h, i++, !(opt.flags & FLAG_DUMP))))
|
|
|
dfabe0 |
{
|
|
|
dfabe0 |
if (opt.flags & FLAG_DUMP)
|
|
|
dfabe0 |
{
|
|
|
dfabe0 |
int j, l = strlen(s) + 1;
|
|
|
dfabe0 |
+
|
|
|
dfabe0 |
+ off = 0;
|
|
|
dfabe0 |
for (row = 0; row < ((l - 1) >> 4) + 1; row++)
|
|
|
dfabe0 |
{
|
|
|
dfabe0 |
- printf("%s\t", prefix);
|
|
|
dfabe0 |
for (j = 0; j < 16 && j < l - (row << 4); j++)
|
|
|
dfabe0 |
- printf("%s%02X", j ? " " : "",
|
|
|
dfabe0 |
+ off += sprintf(raw_data + off,
|
|
|
dfabe0 |
+ j ? " %02X" : "%02X",
|
|
|
dfabe0 |
(unsigned char)s[(row << 4) + j]);
|
|
|
dfabe0 |
- printf("\n");
|
|
|
dfabe0 |
+ pr_list_item(raw_data);
|
|
|
dfabe0 |
}
|
|
|
dfabe0 |
/* String isn't filtered yet so do it now */
|
|
|
dfabe0 |
ascii_filter(s, l - 1);
|
|
|
dfabe0 |
}
|
|
|
dfabe0 |
- printf("%s\t%s\n", prefix, s);
|
|
|
dfabe0 |
+ pr_list_item("%s", s);
|
|
|
dfabe0 |
}
|
|
|
dfabe0 |
+ pr_list_end();
|
|
|
dfabe0 |
}
|
|
|
dfabe0 |
}
|
|
|
dfabe0 |
|
|
|
dfabe0 |
@@ -5060,7 +5066,7 @@ static void dmi_decode(const struct dmi_header *h, u16 ver)
|
|
|
dfabe0 |
return;
|
|
|
dfabe0 |
pr_handle_name("%s Type",
|
|
|
dfabe0 |
h->type >= 128 ? "OEM-specific" : "Unknown");
|
|
|
dfabe0 |
- dmi_dump(h, "\t");
|
|
|
dfabe0 |
+ dmi_dump(h);
|
|
|
dfabe0 |
}
|
|
|
dfabe0 |
printf("\n");
|
|
|
dfabe0 |
}
|
|
|
dfabe0 |
@@ -5206,7 +5212,7 @@ static void dmi_table_decode(u8 *buf, u32 len, u16 num, u16 ver, u32 flags)
|
|
|
dfabe0 |
{
|
|
|
dfabe0 |
if (opt.flags & FLAG_DUMP)
|
|
|
dfabe0 |
{
|
|
|
dfabe0 |
- dmi_dump(&h, "\t");
|
|
|
dfabe0 |
+ dmi_dump(&h);
|
|
|
dfabe0 |
printf("\n");
|
|
|
dfabe0 |
}
|
|
|
dfabe0 |
else
|
|
|
dfabe0 |
--
|
|
|
dfabe0 |
2.17.1
|
|
|
dfabe0 |
|