mirrors/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD synced 2026-01-16 17:02:37 +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/strings.cpp
View File

@@ -2043,11 +2043,10 @@ const LanguageMetadata *GetLanguage(uint8_t newgrflangid)
*/
static bool GetLanguageFileHeader(const std::string &file, LanguagePackHeader *hdr)
{
FILE *f = fopen(file.c_str(), "rb");
if (f == nullptr) return false;
auto f = FileHandle::Open(file, "rb");
if (!f.has_value()) return false;
size_t read = fread(hdr, sizeof(*hdr), 1, f);
fclose(f);
size_t read = fread(hdr, sizeof(*hdr), 1, *f);
bool ret = read == 1 && hdr->IsValid();