mirror of
https://github.com/gbdev/rgbds.git
synced 2026-05-08 10:59:36 +00:00
Fix two warnings on MinGW
This commit is contained in:
+16
-4
@@ -934,8 +934,14 @@ bool sect_BinaryFile(std::string const &name, uint32_t startPos) {
|
||||
Defer closeFile{[&] { fclose(file); }};
|
||||
|
||||
if (fseek(file, 0, SEEK_END) == 0) {
|
||||
if (startPos > ftell(file)) {
|
||||
error("Specified start position is greater than length of file \"%s\"", name.c_str());
|
||||
if (unsigned long fsize = ftell(file);
|
||||
startPos > fsize) { // `ftell` cannot fail here, since `fseek` succeeded.
|
||||
error(
|
||||
"Specified start position (%" PRIu32 ") is greater than length of \"%s\" (%lu)",
|
||||
startPos,
|
||||
name.c_str(),
|
||||
fsize
|
||||
);
|
||||
return false;
|
||||
}
|
||||
// The file is seekable; skip to the specified start position
|
||||
@@ -989,8 +995,14 @@ bool sect_BinaryFileSlice(std::string const &name, uint32_t startPos, uint32_t l
|
||||
Defer closeFile{[&] { fclose(file); }};
|
||||
|
||||
if (fseek(file, 0, SEEK_END) == 0) {
|
||||
if (long fsize = ftell(file); startPos > fsize) {
|
||||
error("Specified start position is greater than length of file \"%s\"", name.c_str());
|
||||
if (unsigned long fsize = ftell(file);
|
||||
startPos > fsize) { // `ftell` cannot fail here, since `fseek` succeeded.
|
||||
error(
|
||||
"Specified start position (%" PRIu32 ") is greater than length of \"%s\" (%lu)",
|
||||
startPos,
|
||||
name.c_str(),
|
||||
fsize
|
||||
);
|
||||
return false;
|
||||
} else if (startPos + length > fsize) {
|
||||
error(
|
||||
|
||||
Reference in New Issue
Block a user