fiasco: Mute strncpy warnings

This commit is contained in:
Pali Rohár committed 2023-04-15 22:21:16 +02:00
1 parent 4dd5d6b856
commit 45447099c9
1 file changed
+6 -6
+6 -6
View File
@@ -112,11 +112,11 @@ struct fiasco * fiasco_alloc_from_file(const char * file) {
READ_OR_FAIL(fiasco, buf, length8); READ_OR_FAIL(fiasco, buf, length8);
if ( byte == 0xe8 ) { if ( byte == 0xe8 ) {
memset(fiasco->name, 0, sizeof(fiasco->name)); memset(fiasco->name, 0, sizeof(fiasco->name));
strncpy(fiasco->name, (char *)buf, length8); memcpy(fiasco->name, buf, length8);
VERBOSE("Fiasco name: %s\n", fiasco->name); VERBOSE("Fiasco name: %s\n", fiasco->name);
} else if ( byte == 0x31 ) { } else if ( byte == 0x31 ) {
memset(fiasco->swver, 0, sizeof(fiasco->swver)); memset(fiasco->swver, 0, sizeof(fiasco->swver));
strncpy(fiasco->swver, (char *)buf, length8); memcpy(fiasco->swver, buf, length8);
VERBOSE("SW version: %s\n", fiasco->swver); VERBOSE("SW version: %s\n", fiasco->swver);
} else { } else {
VERBOSE("Unknown header %#x\n", byte); VERBOSE("Unknown header %#x\n", byte);
@@ -206,14 +206,14 @@ struct fiasco * fiasco_alloc_from_file(const char * file) {
if ( byte == '1' ) { if ( byte == '1' ) {
memset(version, 0, sizeof(version)); memset(version, 0, sizeof(version));
strncpy(version, (char *)buf, length8); memcpy(version, buf, length8);
VERBOSE("version string\n"); VERBOSE("version string\n");
VERBOSE(" version: %s\n", version); VERBOSE(" version: %s\n", version);
} else if ( byte == '2' ) { } else if ( byte == '2' ) {
int tmp = length8; int tmp = length8;
if ( tmp > 16 ) tmp = 16; if ( tmp > 16 ) tmp = 16;
memset(device, 0, sizeof(device)); memset(device, 0, sizeof(device));
strncpy(device, (char *)buf, tmp); memcpy(device, buf, tmp);
VERBOSE("hw revision\n"); VERBOSE("hw revision\n");
VERBOSE(" device: %s\n", device); VERBOSE(" device: %s\n", device);
pbuf = buf + strlen(device) + 1; pbuf = buf + strlen(device) + 1;
@@ -224,7 +224,7 @@ struct fiasco * fiasco_alloc_from_file(const char * file) {
tmp = buf + length8 - pbuf; tmp = buf + length8 - pbuf;
if ( tmp > 8 ) tmp = 8; if ( tmp > 8 ) tmp = 8;
memset(hwrev, 0, sizeof(hwrev)); memset(hwrev, 0, sizeof(hwrev));
strncpy(hwrev, (char *)pbuf, tmp); memcpy(hwrev, pbuf, tmp);
if ( ! hwrevs[0] ) if ( ! hwrevs[0] )
strcpy(hwrevs, hwrev); strcpy(hwrevs, hwrev);
else { else {
@@ -240,7 +240,7 @@ struct fiasco * fiasco_alloc_from_file(const char * file) {
} }
} else if ( byte == '3' ) { } else if ( byte == '3' ) {
memset(layout, 0, sizeof(layout)); memset(layout, 0, sizeof(layout));
strncpy(layout, (char *)buf, length8); memcpy(layout, buf, length8);
VERBOSE("layout\n"); VERBOSE("layout\n");
} else if ( byte == '4' ) { } else if ( byte == '4' ) {
VERBOSE("data part\n"); VERBOSE("data part\n");