gbdev/rgbds
1
0
Fork 0
mirror of https://github.com/gbdev/rgbds.git synced 2026-09-24 06:37:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use std::optional<uint64_t> instead of long with a special -1 sentinel for seekSize

Browse Source
This commit is contained in:
Rangi
2026-07-21 14:31:05 -04:00
parent c3073f4318
commit c691ec6607
5 changed files with 29 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/asm/actions.cpp
+3 -3
View File
@@ -151,11 +151,11 @@ std::optional<std::string> act_ReadFile(std::string const &name, uint32_t maxLen
Defer closeFile{[&] { xfclose(file); }};
size_t readSize = maxLen;
if (long fileSize = seekSize(file); fileSize != -1) {
if (std::optional<uint64_t> fileSize = seekSize(file); fileSize.has_value()) {
// If the file is seekable and shorter than the max length,
// just read as many bytes as there are
if (static_cast<size_t>(fileSize) < readSize) {
readSize = fileSize;
if (*fileSize < readSize) {
readSize = *fileSize;
}
// LCOV_EXCL_START
} else if (errno != ESPIPE) {
src/asm/section.cpp
+13 -11
View File
@@ -977,13 +977,14 @@ bool sect_BinaryFile(std::string const &name, uint32_t startPos) {
}
Defer closeFile{[&] { xfclose(file); }};
if (long fileSize = seekSize(file); fileSize != -1) {
if (startPos > static_cast<size_t>(fileSize)) {
if (std::optional<uint64_t> fileSize = seekSize(file); fileSize.has_value()) {
if (startPos > *fileSize) {
error(
"Specified start position (%" PRIu32 ") is greater than length of \"%s\" (%ld)",
"Specified start position (%" PRIu32 ") is greater than length of \"%s\" (%" PRIu64
")",
startPos,
name.c_str(),
fileSize
*fileSize
);
return false;
}
@@ -1037,23 +1038,24 @@ bool sect_BinaryFileSlice(std::string const &name, uint32_t startPos, uint32_t l
}
Defer closeFile{[&] { xfclose(file); }};
if (long fileSize = seekSize(file); fileSize != -1) {
if (startPos > static_cast<size_t>(fileSize)) {
if (std::optional<uint64_t> fileSize = seekSize(file); fileSize.has_value()) {
if (startPos > *fileSize) {
error(
"Specified start position (%" PRIu32 ") is greater than length of \"%s\" (%ld)",
"Specified start position (%" PRIu32 ") is greater than length of \"%s\" (%" PRIu64
")",
startPos,
name.c_str(),
fileSize
*fileSize
);
return false;
} else if (startPos + length > static_cast<size_t>(fileSize)) {
} else if (startPos + length > *fileSize) {
error(
"Specified range in `INCBIN` file \"%s\" is out of bounds (%" PRIu32 " + %" PRIu32
" > %ld)",
" > %" PRIu64 ")",
name.c_str(),
startPos,
length,
fileSize
*fileSize
);
return false;
}