From 747cdf796ff4a030cc26d352cf87c55e4981014e Mon Sep 17 00:00:00 2001 From: superp00t Date: Thu, 24 Aug 2023 20:47:11 -0400 Subject: [PATCH] fix(os): use HOSFILE_INVALID to denote an invalid file handle --- bc/os/File.cpp | 8 ++++---- bc/os/File.hpp | 2 ++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/bc/os/File.cpp b/bc/os/File.cpp index 0a53997..215cf35 100644 --- a/bc/os/File.cpp +++ b/bc/os/File.cpp @@ -5,9 +5,9 @@ HOSFILE OsCreateFile(const char* fileName, uint32_t desiredAccess, uint32_t shareMode, uint32_t createDisposition, uint32_t flagsAndAttributes, uint32_t extendedFileType) { // Ensure sanity - BLIZZARD_VALIDATE(fileName, "invalid filename", nullptr); - BLIZZARD_VALIDATE(desiredAccess != 0, "invalid desired access", nullptr); - BLIZZARD_VALIDATE(createDisposition <= OS_TRUNCATE_EXISTING, "invalid create disposition", nullptr); + BLIZZARD_VALIDATE(fileName, "invalid filename", HOSFILE_INVALID); + BLIZZARD_VALIDATE(desiredAccess != 0, "invalid desired access", HOSFILE_INVALID); + BLIZZARD_VALIDATE(createDisposition <= OS_TRUNCATE_EXISTING, "invalid create disposition", HOSFILE_INVALID); uint32_t flags = 0; @@ -55,7 +55,7 @@ HOSFILE OsCreateFile(const char* fileName, uint32_t desiredAccess, uint32_t shar Blizzard::File::StreamRecord* stream; bool success = Blizzard::File::Open(fileName, flags, stream); if (!success) { - return nullptr; + return HOSFILE_INVALID; } // Set attributes diff --git a/bc/os/File.hpp b/bc/os/File.hpp index f78fe88..7d26294 100644 --- a/bc/os/File.hpp +++ b/bc/os/File.hpp @@ -50,6 +50,8 @@ enum EOSFileFlagsAndAttributes { typedef Blizzard::File::StreamRecord* HOSFILE; +constexpr HOSFILE HOSFILE_INVALID = nullptr; + HOSFILE OsCreateFile(const char* fileName, uint32_t desiredAccess, uint32_t shareMode, uint32_t createDisposition, uint32_t flagsAndAttributes, uint32_t extendedFileType); int32_t OsSetFileAttributes(const char* fileName, uint32_t attributes);