From 29c1ee0b8a146fcfeb9a4ca28283ae820352c6f8 Mon Sep 17 00:00:00 2001 From: khali Date: Tue, 12 May 2015 15:58:20 +0000 Subject: dmidecode: Remove extra blank line after hidden type 40 When we don't decode type 40 in quiet mode, we shouldn't print the blank line after it either. --- CHANGELOG | 5 +++++ dmidecode.c | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index a28282f..c355481 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,8 @@ +2015-05-12 Jean Delvare + + * dmidecode.c: Remove extra blank line after hidden DMI type 40 + structure. + 2015-05-04 Jean Delvare * dmidecode.c: Move table decoding to a separate function. diff --git a/dmidecode.c b/dmidecode.c index 1f948f0..df3a33e 100644 --- a/dmidecode.c +++ b/dmidecode.c @@ -4263,8 +4263,9 @@ static void dmi_decode(const struct dmi_header *h, u16 ver) case 40: /* 7.41 Additional Information */ if (h->length < 0x0B) break; - if (!(opt.flags & FLAG_QUIET)) - dmi_additional_info(h, ""); + if (opt.flags & FLAG_QUIET) + return; + dmi_additional_info(h, ""); break; case 41: /* 7.42 Onboard Device Extended Information */ -- cgit v1.2.1