Skip to content

Commit

Permalink
romfs/tools: Silence more compiler warnings with GCC 8.1
Browse files Browse the repository at this point in the history
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 <[email protected]>
Signed-off-by: Alexey Kardashevskiy <[email protected]>
  • Loading branch information
huth authored and aik committed Jul 24, 2018
1 parent 49482e0 commit d8a9354
Showing 1 changed file with 12 additions and 7 deletions.
19 changes: 12 additions & 7 deletions romfs/tools/create_crc.c
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,11 @@ static uint64_t ui64globalHeaderSize = 0;
/* flag to filter detect the header in buildDataStream() */
static int iglobalHeaderFlag = 1;

static size_t min(size_t a, size_t b)
{
return a < b ? a : b;
}

/**
* Build the file image and store it as Data Stream of bytes
* calculate a first CRC for the first file and
Expand Down Expand Up @@ -80,13 +85,13 @@ createHeaderImage(int notime)
};

/* 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 */
Expand Down

0 comments on commit d8a9354

Please sign in to comment.