diff options
| author | khali <khali> | 2015-05-12 15:58:20 +0000 |
|---|---|---|
| committer | khali <khali> | 2015-05-12 15:58:20 +0000 |
| commit | 29c1ee0b8a146fcfeb9a4ca28283ae820352c6f8 (patch) | |
| tree | e7297ef41ce28b8b40bf456510b91219dab32d23 | |
| parent | fbae0a5f76371a2f2c9d1155979329676ad802e4 (diff) | |
| download | dmidecode-29c1ee0b8a146fcfeb9a4ca28283ae820352c6f8.tar.gz | |
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.
| -rw-r--r-- | CHANGELOG | 5 | ||||
| -rw-r--r-- | dmidecode.c | 5 |
2 files changed, 8 insertions, 2 deletions
@@ -1,3 +1,8 @@ +2015-05-12 Jean Delvare <jdelvare@suse.de> + + * dmidecode.c: Remove extra blank line after hidden DMI type 40 + structure. + 2015-05-04 Jean Delvare <jdelvare@suse.de> * 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 */ |