Blame SOURCES/0006-dmidecode-Reduce-the-indentation-of-type-42-structur.patch

f877e3
From 61f3f163b98b271c6613b9744128b99f33e6e19e Mon Sep 17 00:00:00 2001
f877e3
From: Jean Delvare <jdelvare@suse.de>
f877e3
Date: Mon, 23 Mar 2020 16:47:37 +0100
f877e3
Subject: [PATCH 06/23] dmidecode: Reduce the indentation of type 42 structures
f877e3
f877e3
There is no reason to indent the device information that much in type
f877e3
42 structures. Remove the extra level of indentation for consistency
f877e3
and readability.
f877e3
f877e3
Signed-off-by: Jean Delvare <jdelvare@suse.de>
f877e3
---
f877e3
 dmidecode.c | 40 ++++++++++++++++++++--------------------
f877e3
 1 file changed, 20 insertions(+), 20 deletions(-)
f877e3
f877e3
diff --git a/dmidecode.c b/dmidecode.c
f877e3
index 0d95cf9d8f7b..fc140e7e36a9 100644
f877e3
--- a/dmidecode.c
f877e3
+++ b/dmidecode.c
f877e3
@@ -3545,7 +3545,7 @@ static void dmi_parse_protocol_record(const char *prefix, u8 *rec)
f877e3
 	/* DSP0270: 8.5: Protocol Record Data */
f877e3
 	rdata = &rec[0x2];
f877e3
 
f877e3
-	printf("%s\tProtocol ID: %02x (%s)\n", prefix, rid,
f877e3
+	printf("%sProtocol ID: %02x (%s)\n", prefix, rid,
f877e3
 		dmi_protocol_record_type(rid));
f877e3
 
f877e3
 	/*
f877e3
@@ -3575,7 +3575,7 @@ static void dmi_parse_protocol_record(const char *prefix, u8 *rec)
f877e3
 	 * endianess of the field is always little after version 2.6.0
f877e3
 	 * we can just pick a sufficiently recent version here.
f877e3
 	 */
f877e3
-	printf("%s\t\tService UUID: ", prefix);
f877e3
+	printf("%s\tService UUID: ", prefix);
f877e3
 	dmi_system_uuid(&rdata[0], 0x311);
f877e3
 	printf("\n");
f877e3
 
f877e3
@@ -3585,13 +3585,13 @@ static void dmi_parse_protocol_record(const char *prefix, u8 *rec)
f877e3
 	 * uses decimal, so as to make it more comparable
f877e3
 	 */
f877e3
 	assign_val = rdata[16];
f877e3
-	printf("%s\t\tHost IP Assignment Type: %s\n", prefix,
f877e3
+	printf("%s\tHost IP Assignment Type: %s\n", prefix,
f877e3
 		dmi_protocol_assignment_type(assign_val));
f877e3
 
f877e3
 	/* DSP0270: 8.6: Redfish Over IP Host Address format */
f877e3
 	addrtype = rdata[17];
f877e3
 	addrstr = dmi_address_type(addrtype);
f877e3
-	printf("%s\t\tHost IP Address Format: %s\n", prefix,
f877e3
+	printf("%s\tHost IP Address Format: %s\n", prefix,
f877e3
 		addrstr);
f877e3
 
f877e3
 	/* DSP0270: 8.6 IP Assignment types */
f877e3
@@ -3599,24 +3599,24 @@ static void dmi_parse_protocol_record(const char *prefix, u8 *rec)
f877e3
 	if (assign_val == 0x1 || assign_val == 0x3)
f877e3
 	{
f877e3
 		/* DSP0270: 8.6: the Host IPv[4|6] Address */
f877e3
-		printf("%s\t\t%s Address: %s\n", prefix, addrstr,
f877e3
+		printf("%s\t%s Address: %s\n", prefix, addrstr,
f877e3
 			dmi_address_decode(&rdata[18], buf, addrtype));
f877e3
 
f877e3
 		/* DSP0270: 8.6: Prints the Host IPv[4|6] Mask */
f877e3
-		printf("%s\t\t%s Mask: %s\n", prefix, addrstr,
f877e3
+		printf("%s\t%s Mask: %s\n", prefix, addrstr,
f877e3
 			dmi_address_decode(&rdata[34], buf, addrtype));
f877e3
 	}
f877e3
 
f877e3
 	/* DSP0270: 8.6: Get the Redfish Service IP Discovery Type */
f877e3
 	assign_val = rdata[50];
f877e3
 	/* Redfish Service IP Discovery type mirrors Host IP Assignment type */
f877e3
-	printf("%s\t\tRedfish Service IP Discovery Type: %s\n", prefix,
f877e3
+	printf("%s\tRedfish Service IP Discovery Type: %s\n", prefix,
f877e3
 		dmi_protocol_assignment_type(assign_val));
f877e3
 
f877e3
 	/* DSP0270: 8.6: Get the Redfish Service IP Address Format */
f877e3
 	addrtype = rdata[51];
f877e3
 	addrstr = dmi_address_type(addrtype);
f877e3
-	printf("%s\t\tRedfish Service IP Address Format: %s\n", prefix,
f877e3
+	printf("%s\tRedfish Service IP Address Format: %s\n", prefix,
f877e3
 		addrstr);
f877e3
 
f877e3
 	if (assign_val == 0x1 || assign_val == 0x3)
f877e3
@@ -3625,20 +3625,20 @@ static void dmi_parse_protocol_record(const char *prefix, u8 *rec)
f877e3
 		u32 vlan;
f877e3
 
f877e3
 		/* DSP0270: 8.6: Prints the Redfish IPv[4|6] Service Address */
f877e3
-		printf("%s\t\t%s Redfish Service Address: %s\n", prefix,
f877e3
+		printf("%s\t%s Redfish Service Address: %s\n", prefix,
f877e3
 			addrstr, dmi_address_decode(&rdata[52], buf,
f877e3
 			addrtype));
f877e3
 
f877e3
 		/* DSP0270: 8.6: Prints the Redfish IPv[4|6] Service Mask */
f877e3
-		printf("%s\t\t%s Redfish Service Mask: %s\n", prefix,
f877e3
+		printf("%s\t%s Redfish Service Mask: %s\n", prefix,
f877e3
 			addrstr, dmi_address_decode(&rdata[68], buf,
f877e3
 			addrtype));
f877e3
 
f877e3
 		/* DSP0270: 8.6: Redfish vlan and port info */
f877e3
 		port = WORD(&rdata[84]);
f877e3
 		vlan = DWORD(&rdata[86]);
f877e3
-		printf("%s\t\tRedfish Service Port: %hu\n", prefix, port);
f877e3
-		printf("%s\t\tRedfish Service Vlan: %u\n", prefix, vlan);
f877e3
+		printf("%s\tRedfish Service Port: %hu\n", prefix, port);
f877e3
+		printf("%s\tRedfish Service Vlan: %u\n", prefix, vlan);
f877e3
 	}
f877e3
 
f877e3
 	/* DSP0270: 8.6: Redfish host length and name */
f877e3
@@ -3655,7 +3655,7 @@ static void dmi_parse_protocol_record(const char *prefix, u8 *rec)
f877e3
 		hname = out_of_spec;
f877e3
 		hlen = strlen(out_of_spec);
f877e3
 	}
f877e3
-	printf("%s\t\tRedfish Service Hostname: %.*s\n", prefix, hlen, hname);
f877e3
+	printf("%s\tRedfish Service Hostname: %.*s\n", prefix, hlen, hname);
f877e3
 }
f877e3
 
f877e3
 /*
f877e3
@@ -3728,10 +3728,10 @@ static void dmi_parse_controller_structure(const struct dmi_header *h,
f877e3
 			/* USB Device Type - need at least 6 bytes */
f877e3
 			u8 *usbdata = &data[0x7];
f877e3
 			/* USB Device Descriptor: idVendor */
f877e3
-			printf("%s\tidVendor: 0x%04x\n", prefix,
f877e3
+			printf("%sidVendor: 0x%04x\n", prefix,
f877e3
 				WORD(&usbdata[0x0]));
f877e3
 			/* USB Device Descriptor: idProduct */
f877e3
-			printf("%s\tidProduct: 0x%04x\n", prefix,
f877e3
+			printf("%sidProduct: 0x%04x\n", prefix,
f877e3
 				WORD(&usbdata[0x2]));
f877e3
 			/*
f877e3
 			 * USB Serial number is here, but its useless, don't
f877e3
@@ -3743,16 +3743,16 @@ static void dmi_parse_controller_structure(const struct dmi_header *h,
f877e3
 			/* PCI Device Type - Need at least 8 bytes */
f877e3
 			u8 *pcidata = &data[0x7];
f877e3
 			/* PCI Device Descriptor: VendorID */
f877e3
-			printf("%s\tVendorID: 0x%04x\n", prefix,
f877e3
+			printf("%sVendorID: 0x%04x\n", prefix,
f877e3
 				WORD(&pcidata[0x0]));
f877e3
 			/* PCI Device Descriptor: DeviceID */
f877e3
-			printf("%s\tDeviceID: 0x%04x\n", prefix,
f877e3
+			printf("%sDeviceID: 0x%04x\n", prefix,
f877e3
 				WORD(&pcidata[0x2]));
f877e3
 			/* PCI Device Descriptor: PCI SubvendorID */
f877e3
-			printf("%s\tSubVendorID: 0x%04x\n", prefix,
f877e3
+			printf("%sSubVendorID: 0x%04x\n", prefix,
f877e3
 				WORD(&pcidata[0x4]));
f877e3
 			/* PCI Device Descriptor: PCI SubdeviceID */
f877e3
-			printf("%s\tSubDeviceID: 0x%04x\n", prefix,
f877e3
+			printf("%sSubDeviceID: 0x%04x\n", prefix,
f877e3
 				WORD(&pcidata[0x6]));
f877e3
 		}
f877e3
 		else if (type == 0x4 && len >= 5)
f877e3
@@ -3760,7 +3760,7 @@ static void dmi_parse_controller_structure(const struct dmi_header *h,
f877e3
 			/* OEM Device Type - Need at least 4 bytes */
f877e3
 			u8 *oemdata = &data[0x7];
f877e3
 			/* OEM Device Descriptor: IANA */
f877e3
-			printf("%s\tVendor ID: 0x%02x:0x%02x:0x%02x:0x%02x\n",
f877e3
+			printf("%sVendor ID: 0x%02x:0x%02x:0x%02x:0x%02x\n",
f877e3
 				prefix, oemdata[0x0], oemdata[0x1],
f877e3
 				oemdata[0x2], oemdata[0x3]);
f877e3
 		}
f877e3
-- 
f877e3
2.17.1
f877e3