diff mbox series

[3/4] romfs/tools: Silence more compiler warnings with GCC 8.1

Message ID 1531917704-21355-4-git-send-email-thuth@redhat.com
State Superseded
Headers show
Series Clean-ups and fixes for the build_romfs tool | expand

Commit Message

Thomas Huth July 18, 2018, 12:41 p.m. UTC 
GCC 8 complains about the following usages of strncpy, too:

create_crc.c:86:3: warning: ‘strncpy’ specified bound 16 equals destination
 size [-Wstringop-truncation]
   strncpy(uHeader.stHeader.version, pcVersion, 16);
   ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
create_crc.c:84:3: warning: ‘strncpy’ specified bound 16 equals destination
 size [-Wstringop-truncation]
   strncpy(uHeader.stHeader.version, pcVersion, 16);
   ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Let's work around the issue by using memcpy instead.

Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 romfs/tools/create_crc.c | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)
diff mbox series

Patch

diff --git a/romfs/tools/create_crc.c b/romfs/tools/create_crc.c
index ca24dfd..4b9d639 100644
--- a/romfs/tools/create_crc.c
+++ b/romfs/tools/create_crc.c
@@ -23,6 +23,8 @@ 
 #include "createcrc.h"
 #include "crclib.h"
 
+#define min(a, b) ((a) < (b) ? (a) : (b))
+
 /* file length in bytes */
 static uint64_t ui64globalFileSize = 0;
 /* space for the file stream >= 4MB + 4bytes */
@@ -82,13 +84,13 @@  createHeaderImage(int notime)
 	assert(sizeof(stHeader) == FLASHFS_HEADER_DATA_SIZE);
 
 	/* read driver info */
-	if (NULL != (pcVersion = getenv("DRIVER_NAME"))) {
-		strncpy(stHeader.version, pcVersion, 16);
-	} else if (NULL != (pcVersion = getenv("USER"))) {
-		strncpy(stHeader.version, pcVersion, 16);
-	} else if (pcVersion == NULL) {
-		strncpy(stHeader.version, "No known user!", 16);
-	}
+	pcVersion = getenv("DRIVER_NAME");
+	if (!pcVersion)
+		pcVersion = getenv("USER");
+	if (!pcVersion)
+		pcVersion = "unknown";
+	memcpy(stHeader.version, pcVersion,
+	       min(strlen(pcVersion), sizeof(stHeader.version)));
 
 	if (!notime) {
 		/* read time and write it into data stream */