gbdev/rgbds
1
0
Fork 0
mirror of https://github.com/gbdev/rgbds.git synced 2025-11-21 02:32:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make file.hpp independent of gfx (#1733)

Browse Source
This commit is contained in:
Rangi
2025-07-08 15:16:16 -04:00
committed by GitHub
parent 5de05e2e4b
commit 6869e4807c
2 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/file.hpp
View File

@@ -15,8 +15,6 @@
#include "helpers.hpp" // assume #include "helpers.hpp" // assume
#include "platform.hpp" #include "platform.hpp"
#include "gfx/warning.hpp"
class File { class File {
std::variant<std::streambuf *, std::filebuf> _file; std::variant<std::streambuf *, std::filebuf> _file;
@@ -32,11 +30,7 @@ public:
assume(!(mode & std::ios_base::out)); assume(!(mode & std::ios_base::out));
_file.emplace<std::streambuf *>(std::cin.rdbuf()); _file.emplace<std::streambuf *>(std::cin.rdbuf());
if (setmode(STDIN_FILENO, (mode & std::ios_base::binary) ? O_BINARY : O_TEXT) == -1) { if (setmode(STDIN_FILENO, (mode & std::ios_base::binary) ? O_BINARY : O_TEXT) == -1) {
fatal( return nullptr;
"Failed to set stdin to %s mode: %s",
mode & std::ios_base::binary ? "binary" : "text",
strerror(errno)
);
} }
} else { } else {
assume(mode & std::ios_base::out); assume(mode & std::ios_base::out);

3
src/gfx/pal_spec.cpp
View File

@@ -4,6 +4,7 @@
#include <algorithm> #include <algorithm>
#include <charconv> #include <charconv>
#include <errno.h>
#include <fstream> #include <fstream>
#include <inttypes.h> #include <inttypes.h>
#include <limits.h> #include <limits.h>
@@ -612,7 +613,7 @@ void parseExternalPalSpec(char const *arg) {
std::filebuf file; std::filebuf file;
// Some parsers read the file in text mode, others in binary mode // Some parsers read the file in text mode, others in binary mode
if (!file.open(path, std::ios::in | std::get<2>(*iter))) { if (!file.open(path, std::ios::in | std::get<2>(*iter))) {
error("Failed to open palette file \"%s\"", path); fatal("Failed to open palette file \"%s\": %s", path, strerror(errno));
return; return;
} }