From 481a1f3e15adbbb413b6801ed03c69822799ad46 Mon Sep 17 00:00:00 2001 From: superp00t Date: Sun, 16 Mar 2025 02:35:11 -0400 Subject: [PATCH] fix(file): remove System_File.hpp from Windows filestack --- bc/system/file/Stacked.hpp | 62 +++++++++++++++++----------------- bc/system/file/System_File.cpp | 60 ++++++++++++++++---------------- bc/system/file/System_File.hpp | 62 +++++++++++++++++----------------- bc/system/file/win/Stacked.cpp | 49 +++++++++++++-------------- 4 files changed, 116 insertions(+), 117 deletions(-) diff --git a/bc/system/file/Stacked.hpp b/bc/system/file/Stacked.hpp index 98f0d82..709f229 100644 --- a/bc/system/file/Stacked.hpp +++ b/bc/system/file/Stacked.hpp @@ -1,5 +1,5 @@ -#ifndef BC_FILE_SYSTEM_STACKED_HPP -#define BC_FILE_SYSTEM_STACKED_HPP +#ifndef BC_SYSTEM_FILE_STACKED_HPP +#define BC_SYSTEM_FILE_STACKED_HPP #include "bc/file/Types.hpp" #include "bc/file/Filesystem.hpp" @@ -23,35 +23,35 @@ void HoistAll(); void Push(Blizzard::File::Filesystem* fs); // Stacked file functions -bool (SetWorkingDirectory)(FileParms* parms); -bool (Close)(FileParms* parms); -bool (Create)(FileParms* parms); -bool (GetWorkingDirectory)(FileParms* parms); -bool (ProcessDirFast)(FileParms* parms); -bool (Exists)(FileParms* parms); -bool (Flush)(FileParms* parms); -bool (GetFileInfo)(FileParms* parms); -bool (GetFreeSpace)(FileParms* parms); -bool (GetPos)(FileParms* parms); -bool (GetRootChars)(FileParms* parms); -bool (IsAbsolutePath)(FileParms* parms); -bool (IsReadOnly)(FileParms* parms); -bool (MakeAbsolutePath)(FileParms* parms); -bool (CreateDirectory)(FileParms* parms); -bool (Move)(FileParms* parms); -bool (Copy)(FileParms* parms); -bool (Open)(FileParms* parms); -bool (Read)(FileParms* parms); -bool (ReadP)(FileParms* parms); -bool (RemoveDirectory)(FileParms* parms); -bool (SetCacheMode)(FileParms* parms); -bool (SetEOF)(FileParms* parms); -bool (SetAttributes)(FileParms* parms); -bool (SetPos)(FileParms* parms); -bool (Delete)(FileParms* parms); -bool (Write)(FileParms* parms); -bool (WriteP)(FileParms* parms); -bool (Shutdown)(FileParms* parms); +bool SetWorkingDirectory(FileParms* parms); +bool Close(FileParms* parms); +bool Create(FileParms* parms); +bool GetWorkingDirectory(FileParms* parms); +bool ProcessDirFast(FileParms* parms); +bool Exists(FileParms* parms); +bool Flush(FileParms* parms); +bool GetFileInfo(FileParms* parms); +bool GetFreeSpace(FileParms* parms); +bool GetPos(FileParms* parms); +bool GetRootChars(FileParms* parms); +bool IsAbsolutePath(FileParms* parms); +bool IsReadOnly(FileParms* parms); +bool MakeAbsolutePath(FileParms* parms); +bool CreateDirectory(FileParms* parms); +bool Move(FileParms* parms); +bool Copy(FileParms* parms); +bool Open(FileParms* parms); +bool Read(FileParms* parms); +bool ReadP(FileParms* parms); +bool RemoveDirectory(FileParms* parms); +bool SetCacheMode(FileParms* parms); +bool SetEOF(FileParms* parms); +bool SetAttributes(FileParms* parms); +bool SetPos(FileParms* parms); +bool Delete(FileParms* parms); +bool Write(FileParms* parms); +bool WriteP(FileParms* parms); +bool Shutdown(FileParms* parms); } // namespace Stacked } // namespace System_File diff --git a/bc/system/file/System_File.cpp b/bc/system/file/System_File.cpp index 0a1f0b9..6a8becb 100644 --- a/bc/system/file/System_File.cpp +++ b/bc/system/file/System_File.cpp @@ -22,105 +22,105 @@ namespace System_File { bool s_EnableFileLocks = false; -bool (SetWorkingDirectory)(Blizzard::File::Filesystem* fs, Stacked::FileParms* parms) { +bool SetWorkingDirectory(Blizzard::File::Filesystem* fs, Stacked::FileParms* parms) { return Stacked::SetWorkingDirectory(parms); } -bool (Close)(Blizzard::File::Filesystem* fs, Stacked::FileParms* parms) { +bool Close(Blizzard::File::Filesystem* fs, Stacked::FileParms* parms) { return Stacked::Close(parms); } -bool (Create)(Blizzard::File::Filesystem* fs, Stacked::FileParms* parms) { +bool Create(Blizzard::File::Filesystem* fs, Stacked::FileParms* parms) { return Stacked::Create(parms); } -bool (GetWorkingDirectory)(Blizzard::File::Filesystem* fs, Stacked::FileParms* parms) { +bool GetWorkingDirectory(Blizzard::File::Filesystem* fs, Stacked::FileParms* parms) { return Stacked::GetWorkingDirectory(parms); } -bool (ProcessDirFast)(Blizzard::File::Filesystem* fs, Stacked::FileParms* parms) { +bool ProcessDirFast(Blizzard::File::Filesystem* fs, Stacked::FileParms* parms) { return Stacked::ProcessDirFast(parms); } -bool (Exists)(Blizzard::File::Filesystem* fs, Stacked::FileParms* parms) { +bool Exists(Blizzard::File::Filesystem* fs, Stacked::FileParms* parms) { return Stacked::Exists(parms); } -bool (Flush)(Blizzard::File::Filesystem* fs, Stacked::FileParms* parms) { +bool Flush(Blizzard::File::Filesystem* fs, Stacked::FileParms* parms) { return Stacked::Flush(parms); } -bool (GetFileInfo)(Blizzard::File::Filesystem* fs, Stacked::FileParms* parms) { +bool GetFileInfo(Blizzard::File::Filesystem* fs, Stacked::FileParms* parms) { return Stacked::GetFileInfo(parms); } -bool (GetFreeSpace)(Blizzard::File::Filesystem* fs, Stacked::FileParms* parms) { +bool GetFreeSpace(Blizzard::File::Filesystem* fs, Stacked::FileParms* parms) { return Stacked::GetFreeSpace(parms); } -bool (GetPos)(Blizzard::File::Filesystem* fs, Stacked::FileParms* parms) { +bool GetPos(Blizzard::File::Filesystem* fs, Stacked::FileParms* parms) { return Stacked::GetPos(parms); } -bool (GetRootChars)(Blizzard::File::Filesystem* fs, Stacked::FileParms* parms) { +bool GetRootChars(Blizzard::File::Filesystem* fs, Stacked::FileParms* parms) { return Stacked::GetRootChars(parms); } -bool (IsAbsolutePath)(Blizzard::File::Filesystem* fs, Stacked::FileParms* parms) { +bool IsAbsolutePath(Blizzard::File::Filesystem* fs, Stacked::FileParms* parms) { return Stacked::IsAbsolutePath(parms); } -bool (IsReadOnly)(Blizzard::File::Filesystem* fs, Stacked::FileParms* parms) { +bool IsReadOnly(Blizzard::File::Filesystem* fs, Stacked::FileParms* parms) { return Stacked::IsReadOnly(parms); } -bool (MakeAbsolutePath)(Blizzard::File::Filesystem* fs, Stacked::FileParms* parms) { +bool MakeAbsolutePath(Blizzard::File::Filesystem* fs, Stacked::FileParms* parms) { return Stacked::MakeAbsolutePath(parms); } -bool (CreateDirectory)(Blizzard::File::Filesystem* fs, Stacked::FileParms* parms) { +bool CreateDirectory(Blizzard::File::Filesystem* fs, Stacked::FileParms* parms) { return Stacked::CreateDirectory(parms); } -bool (Move)(Blizzard::File::Filesystem* fs, Stacked::FileParms* parms) { +bool Move(Blizzard::File::Filesystem* fs, Stacked::FileParms* parms) { return Stacked::Move(parms); } -bool (Copy)(Blizzard::File::Filesystem* fs, Stacked::FileParms* parms) { +bool Copy(Blizzard::File::Filesystem* fs, Stacked::FileParms* parms) { return Stacked::Copy(parms); } -bool (Open)(Blizzard::File::Filesystem* fs, Stacked::FileParms* parms) { +bool Open(Blizzard::File::Filesystem* fs, Stacked::FileParms* parms) { return Stacked::Open(parms); } -bool (RemoveDirectory)(Blizzard::File::Filesystem* fs, Stacked::FileParms* parms) { +bool RemoveDirectory(Blizzard::File::Filesystem* fs, Stacked::FileParms* parms) { return Stacked::RemoveDirectory(parms); } -bool (SetCacheMode)(Blizzard::File::Filesystem* fs, Stacked::FileParms* parms) { +bool SetCacheMode(Blizzard::File::Filesystem* fs, Stacked::FileParms* parms) { return Stacked::SetCacheMode(parms); } -bool (SetEOF)(Blizzard::File::Filesystem* fs, Stacked::FileParms* parms) { +bool SetEOF(Blizzard::File::Filesystem* fs, Stacked::FileParms* parms) { return Stacked::SetEOF(parms); } -bool (SetAttributes)(Blizzard::File::Filesystem* fs, Stacked::FileParms* parms) { +bool SetAttributes(Blizzard::File::Filesystem* fs, Stacked::FileParms* parms) { return Stacked::SetAttributes(parms); } -bool (SetPos)(Blizzard::File::Filesystem* fs, Stacked::FileParms* parms) { +bool SetPos(Blizzard::File::Filesystem* fs, Stacked::FileParms* parms) { return Stacked::SetPos(parms); } -bool (Delete)(Blizzard::File::Filesystem* fs, Stacked::FileParms* parms) { +bool Delete(Blizzard::File::Filesystem* fs, Stacked::FileParms* parms) { return Stacked::Delete(parms); } #if defined(WHOA_SYSTEM_MAC) || defined(WHOA_SYSTEM_LINUX) -bool (Read)(Blizzard::File::StreamRecord* file, void* data, int64_t offset, int32_t* count) { +bool Read(Blizzard::File::StreamRecord* file, void* data, int64_t offset, int32_t* count) { // file must be open to read BLIZZARD_ASSERT(file != nullptr && file->filefd != -1); @@ -153,15 +153,15 @@ bool (Read)(Blizzard::File::StreamRecord* file, void* data, int64_t offset, int3 return n == 0; } -bool (Read)(Blizzard::File::Filesystem* fs, Stacked::FileParms* parms) { +bool Read(Blizzard::File::Filesystem* fs, Stacked::FileParms* parms) { return System_File::Read(parms->file, parms->data, -1, &parms->count); } -bool (ReadP)(Blizzard::File::Filesystem* fs, Stacked::FileParms* parms) { +bool ReadP(Blizzard::File::Filesystem* fs, Stacked::FileParms* parms) { return System_File::Read(parms->file, parms->data, parms->offset, &parms->count); } -bool (Write)(Blizzard::File::StreamRecord* file, const void* data, int64_t offset, int32_t* count) { +bool Write(Blizzard::File::StreamRecord* file, const void* data, int64_t offset, int32_t* count) { // file descriptor must be initialized BLIZZARD_ASSERT(file != nullptr && file->filefd != -1); @@ -192,11 +192,11 @@ bool (Write)(Blizzard::File::StreamRecord* file, const void* data, int64_t offse return n == 0; } -bool (Write)(Blizzard::File::Filesystem* fs, Stacked::FileParms* parms) { +bool Write(Blizzard::File::Filesystem* fs, Stacked::FileParms* parms) { return System_File::Write(parms->file, parms->data, -1LL, &parms->count); } -bool (WriteP)(Blizzard::File::Filesystem* fs, Stacked::FileParms* parms) { +bool WriteP(Blizzard::File::Filesystem* fs, Stacked::FileParms* parms) { return System_File::Write(parms->file, parms->data, parms->offset, &parms->count); } diff --git a/bc/system/file/System_File.hpp b/bc/system/file/System_File.hpp index dbad16b..6cf5f7a 100644 --- a/bc/system/file/System_File.hpp +++ b/bc/system/file/System_File.hpp @@ -1,5 +1,5 @@ -#ifndef BC_FILE_SYSTEM_SYSTEM_FILE_HPP -#define BC_FILE_SYSTEM_SYSTEM_FILE_HPP +#ifndef BC_SYSTEM_FILE_SYSTEM_FILE_HPP +#define BC_SYSTEM_FILE_SYSTEM_FILE_HPP #include "bc/Debug.hpp" #include "bc/system/file/Types.hpp" @@ -15,35 +15,35 @@ namespace System_File { extern bool s_EnableFileLocks; // Fs calls -bool (SetWorkingDirectory)(Blizzard::File::Filesystem* fs, Stacked::FileParms* parms); -bool (Close)(Blizzard::File::Filesystem* fs, Stacked::FileParms* parms); -bool (Create)(Blizzard::File::Filesystem* fs, Stacked::FileParms* parms); -bool (GetWorkingDirectory)(Blizzard::File::Filesystem* fs, Stacked::FileParms* parms); -bool (ProcessDirFast)(Blizzard::File::Filesystem* fs, Stacked::FileParms* parms); -bool (Exists)(Blizzard::File::Filesystem* fs, Stacked::FileParms* parms); -bool (Flush)(Blizzard::File::Filesystem* fs, Stacked::FileParms* parms); -bool (GetFileInfo)(Blizzard::File::Filesystem* fs, Stacked::FileParms* parms); -bool (GetFreeSpace)(Blizzard::File::Filesystem* fs, Stacked::FileParms* parms); -bool (GetPos)(Blizzard::File::Filesystem* fs, Stacked::FileParms* parms); -bool (GetRootChars)(Blizzard::File::Filesystem* fs, Stacked::FileParms* parms); -bool (IsAbsolutePath)(Blizzard::File::Filesystem* fs, Stacked::FileParms* parms); -bool (IsReadOnly)(Blizzard::File::Filesystem* fs, Stacked::FileParms* parms); -bool (MakeAbsolutePath)(Blizzard::File::Filesystem* fs, Stacked::FileParms* parms); -bool (CreateDirectory)(Blizzard::File::Filesystem* fs, Stacked::FileParms* parms); -bool (Move)(Blizzard::File::Filesystem* fs, Stacked::FileParms* parms); -bool (Copy)(Blizzard::File::Filesystem* fs, Stacked::FileParms* parms); -bool (Open)(Blizzard::File::Filesystem* fs, Stacked::FileParms* parms); -bool (Read)(Blizzard::File::Filesystem* fs, Stacked::FileParms* parms); -bool (ReadP)(Blizzard::File::Filesystem* fs, Stacked::FileParms* parms); -bool (RemoveDirectory)(Blizzard::File::Filesystem* fs, Stacked::FileParms* parms); -bool (SetCacheMode)(Blizzard::File::Filesystem* fs, Stacked::FileParms* parms); -bool (SetEOF)(Blizzard::File::Filesystem* fs, Stacked::FileParms* parms); -bool (SetAttributes)(Blizzard::File::Filesystem* fs, Stacked::FileParms* parms); -bool (SetPos)(Blizzard::File::Filesystem* fs, Stacked::FileParms* parms); -bool (Delete)(Blizzard::File::Filesystem* fs, Stacked::FileParms* parms); -bool (Write)(Blizzard::File::Filesystem* fs, Stacked::FileParms* parms); -bool (WriteP)(Blizzard::File::Filesystem* fs, Stacked::FileParms* parms); -bool (Shutdown)(Blizzard::File::Filesystem* fs, Stacked::FileParms* parms); +bool SetWorkingDirectory(Blizzard::File::Filesystem* fs, Stacked::FileParms* parms); +bool Close(Blizzard::File::Filesystem* fs, Stacked::FileParms* parms); +bool Create(Blizzard::File::Filesystem* fs, Stacked::FileParms* parms); +bool GetWorkingDirectory(Blizzard::File::Filesystem* fs, Stacked::FileParms* parms); +bool ProcessDirFast(Blizzard::File::Filesystem* fs, Stacked::FileParms* parms); +bool Exists(Blizzard::File::Filesystem* fs, Stacked::FileParms* parms); +bool Flush(Blizzard::File::Filesystem* fs, Stacked::FileParms* parms); +bool GetFileInfo(Blizzard::File::Filesystem* fs, Stacked::FileParms* parms); +bool GetFreeSpace(Blizzard::File::Filesystem* fs, Stacked::FileParms* parms); +bool GetPos(Blizzard::File::Filesystem* fs, Stacked::FileParms* parms); +bool GetRootChars(Blizzard::File::Filesystem* fs, Stacked::FileParms* parms); +bool IsAbsolutePath(Blizzard::File::Filesystem* fs, Stacked::FileParms* parms); +bool IsReadOnly(Blizzard::File::Filesystem* fs, Stacked::FileParms* parms); +bool MakeAbsolutePath(Blizzard::File::Filesystem* fs, Stacked::FileParms* parms); +bool CreateDirectory(Blizzard::File::Filesystem* fs, Stacked::FileParms* parms); +bool Move(Blizzard::File::Filesystem* fs, Stacked::FileParms* parms); +bool Copy(Blizzard::File::Filesystem* fs, Stacked::FileParms* parms); +bool Open(Blizzard::File::Filesystem* fs, Stacked::FileParms* parms); +bool Read(Blizzard::File::Filesystem* fs, Stacked::FileParms* parms); +bool ReadP(Blizzard::File::Filesystem* fs, Stacked::FileParms* parms); +bool RemoveDirectory(Blizzard::File::Filesystem* fs, Stacked::FileParms* parms); +bool SetCacheMode(Blizzard::File::Filesystem* fs, Stacked::FileParms* parms); +bool SetEOF(Blizzard::File::Filesystem* fs, Stacked::FileParms* parms); +bool SetAttributes(Blizzard::File::Filesystem* fs, Stacked::FileParms* parms); +bool SetPos(Blizzard::File::Filesystem* fs, Stacked::FileParms* parms); +bool Delete(Blizzard::File::Filesystem* fs, Stacked::FileParms* parms); +bool Write(Blizzard::File::Filesystem* fs, Stacked::FileParms* parms); +bool WriteP(Blizzard::File::Filesystem* fs, Stacked::FileParms* parms); +bool Shutdown(Blizzard::File::Filesystem* fs, Stacked::FileParms* parms); } // namespace System_File diff --git a/bc/system/file/win/Stacked.cpp b/bc/system/file/win/Stacked.cpp index 24958ad..8d0fc17 100644 --- a/bc/system/file/win/Stacked.cpp +++ b/bc/system/file/win/Stacked.cpp @@ -1,6 +1,5 @@ #if defined(WHOA_SYSTEM_WIN) -#include "bc/system/file/System_File.hpp" #include "bc/system/file/Stacked.hpp" #include "bc/string/QuickFormat.hpp" #include "bc/File.hpp" @@ -196,13 +195,13 @@ namespace Stacked { // begin stacked file functions -bool (SetWorkingDirectory)(FileParms* parms) { +bool SetWorkingDirectory(FileParms* parms) { BLIZZARD_ASSERT(parms->name); return ::SetCurrentDirectory(PATH(parms->name)) != 0; } -bool (Close)(FileParms* parms) { +bool Close(FileParms* parms) { auto file = parms->file; if (file->filehandle != INVALID_HANDLE_VALUE) { ::CloseHandle(file->filehandle); @@ -213,7 +212,7 @@ bool (Close)(FileParms* parms) { return true; } -bool (GetWorkingDirectory)(FileParms* parms) { +bool GetWorkingDirectory(FileParms* parms) { if (!parms->buffer || !parms->buffersize) { // System_File::FileError(8) BC_FILE_SET_ERROR(8); @@ -228,7 +227,7 @@ bool (GetWorkingDirectory)(FileParms* parms) { return true; } -bool (ProcessDirFast)(FileParms* parms) { +bool ProcessDirFast(FileParms* parms) { char dirfindpattern[512]; Blizzard::String::Format(dirfindpattern, 512, "%s\\*", parms->name); @@ -267,7 +266,7 @@ bool (ProcessDirFast)(FileParms* parms) { return false; } -bool (Exists)(FileParms* parms) { +bool Exists(FileParms* parms) { char name[BC_FILE_MAX_PATH]; if (parms->name) { Blizzard::String::MakeBackslashPath(parms->name, name, sizeof(name)); @@ -286,7 +285,7 @@ bool (Exists)(FileParms* parms) { return true; } -bool (Flush)(FileParms* parms) { +bool Flush(FileParms* parms) { auto file = parms->file; if (file->filehandle == INVALID_HANDLE_VALUE) { @@ -297,7 +296,7 @@ bool (Flush)(FileParms* parms) { return ::FlushFileBuffers(file->filehandle) != 0; } -bool (GetFileInfo)(FileParms* parms) { +bool GetFileInfo(FileParms* parms) { if (parms->name) { WIN32_FILE_ATTRIBUTE_DATA fileinfo; if (!::GetFileAttributesEx(PATH(parms->name), GetFileExInfoStandard, &fileinfo)) { @@ -339,7 +338,7 @@ bool (GetFileInfo)(FileParms* parms) { return false; } -bool (GetFreeSpace)(FileParms* parms) { +bool GetFreeSpace(FileParms* parms) { auto name = parms->name; if (name == nullptr || *name == '\0') { BC_FILE_SET_ERROR(8); @@ -376,7 +375,7 @@ bool (GetFreeSpace)(FileParms* parms) { return true; } -bool (GetPos)(FileParms* parms) { +bool GetPos(FileParms* parms) { auto file = parms->file; if (file == nullptr || file->filehandle == INVALID_HANDLE_VALUE) { @@ -395,7 +394,7 @@ bool (GetPos)(FileParms* parms) { return true; } -bool (GetRootChars)(FileParms* parms) { +bool GetRootChars(FileParms* parms) { char pathbuffer[256]; auto pathsize = Blizzard::String::Length(parms->name) + 1; auto path = pathsize > 256 ? reinterpret_cast(Blizzard::Memory::Allocate(pathsize)) : pathbuffer; @@ -429,7 +428,7 @@ bool (GetRootChars)(FileParms* parms) { return true; } -bool (IsAbsolutePath)(FileParms* parms) { +bool IsAbsolutePath(FileParms* parms) { auto path = parms->name; auto first = path[0]; @@ -447,7 +446,7 @@ bool (IsAbsolutePath)(FileParms* parms) { return false; } -bool (IsReadOnly)(FileParms* parms) { +bool IsReadOnly(FileParms* parms) { if (!parms->name) { BC_FILE_SET_ERROR(8); return false; @@ -461,7 +460,7 @@ bool (IsReadOnly)(FileParms* parms) { return dwFileAttributes & FILE_ATTRIBUTE_READONLY; } -bool (MakeAbsolutePath)(FileParms* parms) { +bool MakeAbsolutePath(FileParms* parms) { if (!parms->name) { BC_FILE_SET_ERROR(8); return false; @@ -476,7 +475,7 @@ bool (MakeAbsolutePath)(FileParms* parms) { return true; } -bool (CreateDirectory)(FileParms* parms) { +bool CreateDirectory(FileParms* parms) { if (!parms->name) { BC_FILE_SET_ERROR(8); return false; @@ -560,7 +559,7 @@ bool (CreateDirectory)(FileParms* parms) { return true; } -bool (Move)(FileParms* parms) { +bool Move(FileParms* parms) { char src[BC_FILE_MAX_PATH]; char dst[BC_FILE_MAX_PATH]; if (parms->name) { @@ -576,7 +575,7 @@ bool (Move)(FileParms* parms) { return ::MoveFile(PATH(src), PATH(dst)) != 0; } -bool (Copy)(FileParms* parms) { +bool Copy(FileParms* parms) { char srcname[BC_FILE_MAX_PATH]; char dstname[BC_FILE_MAX_PATH]; if (parms->name) { @@ -635,7 +634,7 @@ bool (Copy)(FileParms* parms) { return result; } -bool (Open)(FileParms* parms) { +bool Open(FileParms* parms) { char name[BC_FILE_MAX_PATH]; if (parms->name) { Blizzard::String::MakeBackslashPath(parms->name, name, BC_FILE_MAX_PATH); @@ -693,7 +692,7 @@ bool (Open)(FileParms* parms) { return true; } -bool (RemoveDirectory)(FileParms* parms) { +bool RemoveDirectory(FileParms* parms) { if (parms->recurse) { return Blizzard::File::RemoveDirectoryAndContents(parms->name, false); } @@ -716,7 +715,7 @@ bool (RemoveDirectory)(FileParms* parms) { return removed != 0; } -bool (SetCacheMode)(FileParms* parms) { +bool SetCacheMode(FileParms* parms) { auto file = parms->file; parms->mode |= ~(Blizzard::File::Mode::nocache); @@ -741,7 +740,7 @@ bool (SetCacheMode)(FileParms* parms) { return true; } -bool (SetEOF)(FileParms* parms) { +bool SetEOF(FileParms* parms) { auto file = parms->file; int64_t offset; @@ -756,7 +755,7 @@ bool (SetEOF)(FileParms* parms) { return status != 0; } -bool (SetAttributes)(FileParms* parms) { +bool SetAttributes(FileParms* parms) { if (parms->setinfo & BC_SYSTEM_FILE_INFO_TIMES) { auto info = parms->info; @@ -784,7 +783,7 @@ bool (SetAttributes)(FileParms* parms) { return parms->setinfo == 0; } -bool (SetPos)(FileParms* parms) { +bool SetPos(FileParms* parms) { auto file = parms->file; if (file->filehandle == INVALID_HANDLE_VALUE) { @@ -810,7 +809,7 @@ bool (SetPos)(FileParms* parms) { return true; } -bool (Delete)(FileParms* parms) { +bool Delete(FileParms* parms) { char name[BC_FILE_MAX_PATH]; if (parms->name) { Blizzard::String::MakeBackslashPath(parms->name, name, BC_FILE_MAX_PATH); @@ -821,7 +820,7 @@ bool (Delete)(FileParms* parms) { } // shutdown -bool (Shutdown)(FileParms* parms) { +bool Shutdown(FileParms* parms) { // ? return true; }