diff --git a/storm/Log.cpp b/storm/Log.cpp index 1d8cc9f..5edd214 100644 --- a/storm/Log.cpp +++ b/storm/Log.cpp @@ -23,12 +23,10 @@ #include #endif - #define STORM_LOG_MAX_CHANNELS 4 #define STORM_LOG_MAX_BUFFER 0x10000 #define STORM_LOG_FLUSH_POINT 0xC000 - #if defined(WHOA_SYSTEM_WIN) typedef SYSTEMTIME SLOGTIME; #else @@ -44,7 +42,6 @@ typedef struct _SLOGTIME { } SLOGTIME; #endif - typedef struct _LOG { HSLOG log; _LOG* next; @@ -58,7 +55,6 @@ typedef struct _LOG { char buffer[STORM_LOG_MAX_BUFFER]; } LOG; - static SCritSect* s_critsect[STORM_LOG_MAX_CHANNELS] = { nullptr }; static SCritSect* s_defaultdir_critsect = nullptr; @@ -68,7 +64,6 @@ static HSLOG s_sequence = 0; static char s_defaultdir[STORM_MAX_PATH] = { '\0' }; static bool s_logsysteminit = false; - static LOG* LockLog(HSLOG log, HLOCKEDLOG* lockedhandle, bool createifnecessary) { if (!log) { *lockedhandle = (HLOCKEDLOG)-1; @@ -320,7 +315,7 @@ static bool OpenLogFile(const char* filename, FILE** file, uint32_t flags) { char newfilename[STORM_MAX_PATH]; PrependDefaultDir(newfilename, STORM_MAX_PATH, filename); CreateFileDirectory(newfilename); - *file = fopen(newfilename, (flags & SLOG_FLAG_APPEND) ? "ab" : "wb"); + *file = fopen(newfilename, (flags & STORM_LOG_FLAG_APPEND) ? "ab" : "wb"); return (*file != nullptr); } return false; @@ -478,12 +473,12 @@ int SLogCreate(const char* filename, uint32_t flags, HSLOG* log) { *log = 0; - if (flags & SLOG_FLAG_NO_FILE) { + if (flags & STORM_LOG_FLAG_NO_FILE) { filename = ""; - flags &= ~SLOG_FLAG_OPEN_FILE; + flags &= ~STORM_LOG_FLAG_OPEN_FILE; } - if ((flags & SLOG_FLAG_OPEN_FILE) == 0 || OpenLogFile(filename, &file, flags)) { + if ((flags & STORM_LOG_FLAG_OPEN_FILE) == 0 || OpenLogFile(filename, &file, flags)) { s_sequence = reinterpret_cast(reinterpret_cast(s_sequence) + 1); *log = s_sequence; LOG* result = LockLog(s_sequence, &lockedhandle, true); diff --git a/storm/Log.hpp b/storm/Log.hpp index 9537eab..6403208 100644 --- a/storm/Log.hpp +++ b/storm/Log.hpp @@ -1,23 +1,20 @@ #ifndef STORM_LOG_HPP #define STORM_LOG_HPP - #include #include #include "storm/Handle.hpp" #include "storm/String.hpp" - -#define SLOG_FLAG_DEFAULT 0 // Create or open log file with first SLogWrite() call -#define SLOG_FLAG_OPEN_FILE 1 // Create or open log file with SLogCreate() -#define SLOG_FLAG_NO_FILE 2 // Don't use log file (use OutputDebugString or console only) -#define SLOG_FLAG_APPEND 4 // Don't truncate existing log file +#define STORM_LOG_FLAG_DEFAULT 0 // Create or open log file with first SLogWrite() call +#define STORM_LOG_FLAG_OPEN_FILE 1 // Create or open log file with SLogCreate() +#define STORM_LOG_FLAG_NO_FILE 2 // Don't use log file (use OutputDebugString or console only) +#define STORM_LOG_FLAG_APPEND 4 // Don't truncate existing log file DECLARE_STRICT_HANDLE(HSLOG); DECLARE_STRICT_HANDLE(HLOCKEDLOG); - void SLogInitialize(); int SLogIsInitialized(); void SLogDestroy(); @@ -32,5 +29,4 @@ int32_t SLogSetIndent(HSLOG log, int32_t deltaIndent); void SLogVWrite(HSLOG log, const char* format, va_list arglist); void SLogWrite(HSLOG log, const char* format, ...); - #endif