File dmidecode-06-hide-irrelevant-fixup-message.patch of Package dmidecode

Overview Repositories Revisions Requests Users Attributes Meta

File dmidecode-06-hide-irrelevant-fixup-message.patch of Package dmidecode (Revision f348a7042b8194bfc42431af10dd19a5)

Currently displaying revision f348a7042b8194bfc42431af10dd19a5 , Show latest

From: Jean Delvare <jdelvare@suse.de>
Date: Tue, 3 May 2016 15:32:21 +0200
Subject: dmidecode: Hide irrelevant fixup message
Git-commit: cff11afa886a0147d734b650755d232b5e7f2099
References: http://savannah.nongnu.org/support/?109024

Only display the message about type 34 length fixup if the entry in
question is going to be displayed. Otherwise it's only confusing.

This fixes bug #109024:
http://savannah.nongnu.org/support/?109024

Fixes: 3f70b3515d91 ("dmidecode: Fix up invalid DMI type 34 structure length")

---
 dmidecode.c |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

--- dmidecode-3.0.orig/dmidecode.c	2016-05-03 16:05:11.533919057 +0200
+++ dmidecode-3.0/dmidecode.c	2016-05-03 16:05:13.223934786 +0200
@@ -2946,7 +2946,7 @@ static void dmi_64bit_memory_error_addre
  * first 5 characters of the device name to be trimmed. It's easy to
  * check and fix, so do it, but warn.
  */
-static void dmi_fixup_type_34(struct dmi_header *h)
+static void dmi_fixup_type_34(struct dmi_header *h, int display)
 {
 	u8 *p = h->data;
 
@@ -2954,7 +2954,9 @@ static void dmi_fixup_type_34(struct dmi
 	if (h->length == 0x10
 	 && is_printable(p + 0x0B, 0x10 - 0x0B))
 	{
-		printf("Invalid entry length (%u). Fixed up to %u.\n", 0x10, 0x0B);
+		if (!(opt.flags & FLAG_QUIET) && display)
+			printf("Invalid entry length (%u). Fixed up to %u.\n",
+				0x10, 0x0B);
 		h->length = 0x0B;
 	}
 }
@@ -4443,7 +4445,7 @@ static void dmi_table_decode(u8 *buf, u3
 
 		/* Fixup a common mistake */
 		if (h.type == 34)
-			dmi_fixup_type_34(&h);
+			dmi_fixup_type_34(&h, display);
 
 		/* look for the next handle */
 		next = data + h.length;

Places

File dmidecode-06-hide-irrelevant-fixup-message.patch of Package dmidecode (Revision f348a7042b8194bfc42431af10dd19a5)

Places