gbdev/rgbds
1
0
Fork 0
mirror of https://github.com/gbdev/rgbds.git synced 2026-08-27 09:05:17 +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/link/output.cpp
+7 -6
View File
@@ -6,6 +6,7 @@
#include <deque>
#include <errno.h>
#include <inttypes.h>
#include <optional>
#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
@@ -112,23 +113,23 @@ static uint32_t checkOverlaySize() {
return 0;
}
long overlaySize = seekSize(overlayFile);
std::optional<uint64_t> overlaySize = seekSize(overlayFile);
if (overlaySize == -1) {
if (!overlaySize.has_value()) {
warnx("Overlay file is not seekable, cannot check if properly formed");
return 0;
}
if (overlaySize % BANK_SIZE) {
if (*overlaySize % BANK_SIZE) {
warnx("Overlay file does not have a size multiple of 0x4000");
} else if (options.is32kMode && overlaySize != 0x8000) {
} else if (options.is32kMode && *overlaySize != 0x8000) {
warnx("Overlay is not exactly 0x8000 bytes large");
}
if (overlaySize < 0x8000) {
if (*overlaySize < 0x8000) {
warnx("Overlay is less than 0x8000 bytes large");
}
return (overlaySize + BANK_SIZE - 1) / BANK_SIZE;
return (*overlaySize + BANK_SIZE - 1) / BANK_SIZE;
}
// Expand `sections[SECTTYPE_ROMX]` to cover all the overlay banks.