summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkhali <khali>2014-03-20 13:47:14 +0000
committerkhali <khali>2014-03-20 13:47:14 +0000
commit815b3418fbe729fa1ec231e9f5870d944729cd86 (patch)
treebb66224f849074d365b17f4bfb2147ae1bfea2f6
parent235b2919439188d52e652db7782f50481e2b5ee2 (diff)
downloaddmidecode-815b3418fbe729fa1ec231e9f5870d944729cd86.tar.gz
Skip the SMBIOS version comparison in quiet mode.
Patch from Jens Rosenboom.
-rw-r--r--AUTHORS1
-rw-r--r--CHANGELOG2
-rw-r--r--dmidecode.c2
3 files changed, 4 insertions, 1 deletions
diff --git a/AUTHORS b/AUTHORS
index eae6bdf..70b315b 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -84,3 +84,4 @@ Thomas Mingarelli
Andrey Matveyev
Stefan Tauner
Naga Chumbalkar
+Jens Rosenboom
diff --git a/CHANGELOG b/CHANGELOG
index 6f0cc5f..cafeb43 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,8 @@
2014-03-20 Jean Delvare <jdelvare@suse.de>
* dmidecode.c: Let legacy_decode be quiet in dump mode too.
+ * dmidecode.c: Skip the SMBIOS version comparison in quiet mode.
+ Patch from Jens Rosenboom.
2014-02-25 Jean Delvare <jdelvare@suse.de>
diff --git a/dmidecode.c b/dmidecode.c
index d36eca6..982179f 100644
--- a/dmidecode.c
+++ b/dmidecode.c
@@ -4336,7 +4336,7 @@ static void dmi_table(u32 base, u16 len, u16 num, u16 ver, const char *devmem)
u8 *data;
int i = 0;
- if (ver > SUPPORTED_SMBIOS_VER)
+ if (ver > SUPPORTED_SMBIOS_VER && !(opt.flags & FLAG_QUIET))
{
printf("# SMBIOS implementations newer than version %u.%u are not\n"
"# fully supported by this version of dmidecode.\n",