[SLOF] [PATCH 1/4] romfs/tools: Remove superfluous union around the rom header struct

[Thomas Huth]

Accessing the struct with memset and memcpy can also be done without
the union wrapper.

Signed-off-by: Thomas Huth <thuth at redhat.com>
---
 romfs/tools/create_crc.c | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/romfs/tools/create_crc.c b/romfs/tools/create_crc.c
index 5a76b9c..d33dfe4 100644
--- a/romfs/tools/create_crc.c
+++ b/romfs/tools/create_crc.c
@@ -10,6 +10,7 @@
  *     IBM Corporation - initial implementation
  *****************************************************************************/
 
+#include <assert.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -71,21 +72,20 @@ createHeaderImage(int notime)
 	char dastr[16] = { 0, };
 	unsigned long long da = 0;
 
-	union {
-		unsigned char pcArray[FLASHFS_HEADER_DATA_SIZE];
-		struct stH stHeader;
-	} uHeader;
+	struct stH stHeader;
+
+	assert(sizeof(stHeader) == FLASHFS_HEADER_DATA_SIZE);
 
 	/* initialize Header */
-	memset(uHeader.pcArray, 0x00, FLASHFS_HEADER_DATA_SIZE);
+	memset(&stHeader, 0x00, FLASHFS_HEADER_DATA_SIZE);
 
 	/* read driver info */
 	if (NULL != (pcVersion = getenv("DRIVER_NAME"))) {
-		strncpy(uHeader.stHeader.version, pcVersion, 16);
+		strncpy(stHeader.version, pcVersion, 16);
 	} else if (NULL != (pcVersion = getenv("USER"))) {
-		strncpy(uHeader.stHeader.version, pcVersion, 16);
+		strncpy(stHeader.version, pcVersion, 16);
 	} else if (pcVersion == NULL) {
-		strncpy(uHeader.stHeader.version, "No known user!", 16);
+		strncpy(stHeader.version, "No known user!", 16);
 	}
 
 	if (!notime) {
@@ -104,18 +104,18 @@ createHeaderImage(int notime)
 		}
 		da = cpu_to_be64(strtoll(dastr, NULL, 16));
 	}
-	memcpy(uHeader.stHeader.date, &da, 8);
+	memcpy(stHeader.date, &da, 8);
 
 	/* write Magic value into data stream */
-	strncpy(uHeader.stHeader.magic, FLASHFS_MAGIC, 8);
+	strncpy(stHeader.magic, FLASHFS_MAGIC, 8);
 	/* write platform name into data stream */
-	strcpy(uHeader.stHeader.platform_name, FLASHFS_PLATFORM_MAGIC);
+	strcpy(stHeader.platform_name, FLASHFS_PLATFORM_MAGIC);
 	/* write platform revision into data stream */
-	strcpy(uHeader.stHeader.platform_revision, FLASHFS_PLATFORM_REVISION);
+	strcpy(stHeader.platform_revision, FLASHFS_PLATFORM_REVISION);
 
 
 	/* fill end of file info (8 bytes of FF) into data stream */
-	uHeader.stHeader.ui64FileEnd = -1;
+	stHeader.ui64FileEnd = -1;
 
 	/* read address of next file and address of header date, both are 64 bit values */
 	ui64RomAddr = 0;
@@ -143,8 +143,7 @@ createHeaderImage(int notime)
 	/* fill free space in Header with zeros */
 	memset(&pucFileStream[ui64DataAddr], 0, (ui64RomAddr - ui64DataAddr));
 	/* place data to header */
-	memcpy(&pucFileStream[ui64DataAddr], uHeader.pcArray,
-	       FLASHFS_HEADER_DATA_SIZE);
+	memcpy(&pucFileStream[ui64DataAddr], &stHeader, sizeof(stHeader));
 
 	/* insert header length into data stream */
 	*(uint64_t *) (pucFileStream + FLASHFS_HEADER_SIZE_ADDR) =
-- 
1.8.3.1