mirrors/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD synced 2026-01-22 03:42:41 +01:00
Code Issues Releases Wiki Activity

Codechange: Replace all FILE * with FileHandle RAII class. (#12718)

Browse Source 
This removes the need to manually ensure all files are closed.
This commit is contained in:
Peter Nelson
2024-09-16 08:45:26 +01:00
committed by GitHub
parent 3784a3d3d6
commit 908ee7292b
40 changed files with 368 additions and 442 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/textfile_gui.cpp
View File

@@ -742,15 +742,14 @@ static std::vector<char> Xunzip(std::span<char> input)
/* Get text from file */
size_t filesize;
FILE *handle = FioFOpenFile(textfile, "rb", dir, &filesize);
if (handle == nullptr) return;
auto handle = FioFOpenFile(textfile, "rb", dir, &filesize);
if (!handle.has_value()) return;
/* Early return on empty files. */
if (filesize == 0) return;
std::vector<char> buf;
buf.resize(filesize);
size_t read = fread(buf.data(), 1, buf.size(), handle);
fclose(handle);
size_t read = fread(buf.data(), 1, buf.size(), *handle);
if (read != buf.size()) return;