From b16d2245bbd374805d15cdca585e8b42bf139605 Mon Sep 17 00:00:00 2001 From: Spp Date: Thu, 29 Sep 2011 12:43:05 +0200 Subject: Cosmetic: Multiple cosmetic changes - Added missing space to 'if', 'for', 'while' and 'switch' when it's followed by '(' - Added missing space after a comma and remove space before comma (with some exceptions) - Remove trailing spaces - Convert tab to spaces Note: Only affects files with extension "cpp" and "h" under /src/server --- src/server/shared/Common.cpp | 2 +- src/server/shared/Common.h | 2 +- src/server/shared/Cryptography/BigNumber.cpp | 2 +- src/server/shared/DataStores/DBCStore.h | 10 +-- src/server/shared/Database/DatabaseEnv.h | 2 +- .../Database/Implementation/CharacterDatabase.cpp | 4 +- src/server/shared/Debugging/Errors.h | 6 +- .../shared/Debugging/WheatyExceptionReport.cpp | 4 +- .../shared/Debugging/WheatyExceptionReport.h | 2 +- src/server/shared/Dynamic/LinkedList.h | 6 +- .../shared/Dynamic/LinkedReference/RefManager.h | 2 +- .../shared/Dynamic/LinkedReference/Reference.h | 4 +- src/server/shared/Dynamic/ObjectRegistry.h | 8 +-- .../shared/Dynamic/TypeContainerFunctionsPtr.h | 4 +- src/server/shared/Logging/Log.cpp | 42 ++++++------ src/server/shared/Packets/ByteBuffer.h | 32 ++++----- src/server/shared/Threading/LockedQueue.h | 2 +- src/server/shared/Threading/Threading.cpp | 16 ++--- src/server/shared/Threading/Threading.h | 2 +- src/server/shared/Utilities/EventProcessor.cpp | 6 +- src/server/shared/Utilities/ServiceWin32.cpp | 4 +- src/server/shared/Utilities/Util.cpp | 46 ++++++------- src/server/shared/Utilities/Util.h | 80 +++++++++++----------- 23 files changed, 144 insertions(+), 144 deletions(-) (limited to 'src/server/shared') diff --git a/src/server/shared/Common.cpp b/src/server/shared/Common.cpp index 3cd76181b3b..68b5a62b963 100755 --- a/src/server/shared/Common.cpp +++ b/src/server/shared/Common.cpp @@ -33,7 +33,7 @@ char const* localeNames[TOTAL_LOCALES] = { LocaleConstant GetLocaleByName(const std::string& name) { for (uint32 i = 0; i < TOTAL_LOCALES; ++i) - if(name==localeNames[i]) + if (name==localeNames[i]) return LocaleConstant(i); return LOCALE_enUS; // including enGB case diff --git a/src/server/shared/Common.h b/src/server/shared/Common.h index 004a013da96..ffecf020d24 100755 --- a/src/server/shared/Common.h +++ b/src/server/shared/Common.h @@ -20,7 +20,7 @@ #define TRINITYCORE_COMMON_H // config.h needs to be included 1st -// TODO this thingy looks like hack , but its not, need to +// TODO this thingy looks like hack, but its not, need to // make separate header however, because It makes mess here. #ifdef HAVE_CONFIG_H // Remove Some things that we will define diff --git a/src/server/shared/Cryptography/BigNumber.cpp b/src/server/shared/Cryptography/BigNumber.cpp index 82ca9146c75..6149a680594 100755 --- a/src/server/shared/Cryptography/BigNumber.cpp +++ b/src/server/shared/Cryptography/BigNumber.cpp @@ -42,7 +42,7 @@ BigNumber::BigNumber(uint32 val) BigNumber::~BigNumber() { BN_free(_bn); - if(_array) delete[] _array; + if (_array) delete[] _array; } void BigNumber::SetDword(uint32 val) diff --git a/src/server/shared/DataStores/DBCStore.h b/src/server/shared/DataStores/DBCStore.h index fbf31bb092e..b580048ed45 100755 --- a/src/server/shared/DataStores/DBCStore.h +++ b/src/server/shared/DataStores/DBCStore.h @@ -143,7 +143,7 @@ class DBCStorage if (!fields) fields = result->Fetch(); - if(sql->indexPos >= 0) + if (sql->indexPos >= 0) { uint32 id = fields[sql->sqlIndexPos].GetUInt32(); if (indexTable.asT[id]) @@ -162,7 +162,7 @@ class DBCStorage { if ((*sql->formatString)[columnNumber] == FT_SQL_ABSENT) { - switch(fmt[columnNumber]) + switch (fmt[columnNumber]) { case FT_FLOAT: *((float*)(&sqlDataTable[offset]))= 0.0f; @@ -187,7 +187,7 @@ class DBCStorage else if ((*sql->formatString)[columnNumber] == FT_SQL_PRESENT) { bool validSqlColumn = true; - switch(fmt[columnNumber]) + switch (fmt[columnNumber]) { case FT_FLOAT: *((float*)(&sqlDataTable[offset]))=fields[sqlColumnNumber].GetFloat(); @@ -243,7 +243,7 @@ class DBCStorage DBCFileLoader dbc; // Check if load was successful, only then continue - if(!dbc.Load(fn, fmt)) + if (!dbc.Load(fn, fmt)) return false; stringPoolList.push_back(dbc.AutoProduceStrings(fmt, (char*)dataTable)); @@ -261,7 +261,7 @@ class DBCStorage delete[] ((char*)dataTable); dataTable = NULL; - while(!stringPoolList.empty()) + while (!stringPoolList.empty()) { delete[] stringPoolList.front(); stringPoolList.pop_front(); diff --git a/src/server/shared/Database/DatabaseEnv.h b/src/server/shared/Database/DatabaseEnv.h index f360128d367..5e8ddfe4cde 100755 --- a/src/server/shared/Database/DatabaseEnv.h +++ b/src/server/shared/Database/DatabaseEnv.h @@ -31,7 +31,7 @@ #define _LIKE_ "LIKE" #define _TABLE_SIM_ "`" -#define _CONCAT3_(A, B, C) "CONCAT( " A " , " B " , " C " )" +#define _CONCAT3_(A, B, C) "CONCAT( " A ", " B ", " C " )" #define _OFFSET_ "LIMIT %d, 1" #include "Implementation/LoginDatabase.h" diff --git a/src/server/shared/Database/Implementation/CharacterDatabase.cpp b/src/server/shared/Database/Implementation/CharacterDatabase.cpp index 68fc7ba9c0a..816dc25f1b3 100755 --- a/src/server/shared/Database/Implementation/CharacterDatabase.cpp +++ b/src/server/shared/Database/Implementation/CharacterDatabase.cpp @@ -29,7 +29,7 @@ void CharacterDatabaseConnection::DoPrepareStatements() PREPARE_STATEMENT(CHAR_GET_GUID_BY_NAME, "SELECT guid FROM characters WHERE name = ?", CONNECTION_SYNCH); PREPARE_STATEMENT(CHAR_GET_CHECK_NAME, "SELECT 1 FROM characters WHERE name = ?", CONNECTION_ASYNC); PREPARE_STATEMENT(CHAR_GET_SUM_CHARS, "SELECT COUNT(guid) FROM characters WHERE account = ?", CONNECTION_ASYNC); - PREPARE_STATEMENT(CHAR_GET_CHAR_CREATE_INFO, "SELECT level, race, class FROM characters WHERE account = ? LIMIT 0,?", CONNECTION_ASYNC); + PREPARE_STATEMENT(CHAR_GET_CHAR_CREATE_INFO, "SELECT level, race, class FROM characters WHERE account = ? LIMIT 0, ?", CONNECTION_ASYNC); PREPARE_STATEMENT(CHAR_ADD_BAN, "INSERT INTO character_banned VALUES (?, UNIX_TIMESTAMP(), UNIX_TIMESTAMP()+?, ?, ?, 1)", CONNECTION_ASYNC) PREPARE_STATEMENT(CHAR_SET_NOT_BANNED, "UPDATE character_banned SET active = 0 WHERE guid = ? AND active != 0", CONNECTION_ASYNC) PREPARE_STATEMENT(CHAR_GET_BANINFO, "SELECT FROM_UNIXTIME(bandate), unbandate-bandate, active, unbandate, banreason, bannedby FROM character_banned WHERE guid = ? ORDER BY bandate ASC", CONNECTION_SYNCH) @@ -227,7 +227,7 @@ void CharacterDatabaseConnection::DoPrepareStatements() // Game event saves PREPARE_STATEMENT(CHAR_DEL_GAME_EVENT_SAVE, "DELETE FROM game_event_save WHERE eventEntry = ?", CONNECTION_ASYNC) - PREPARE_STATEMENT(CHAR_ADD_GAME_EVENT_SAVE, "INSERT INTO game_event_save (eventEntry, state, next_start) VALUES (?, ? , ?)", CONNECTION_ASYNC) + PREPARE_STATEMENT(CHAR_ADD_GAME_EVENT_SAVE, "INSERT INTO game_event_save (eventEntry, state, next_start) VALUES (?, ?, ?)", CONNECTION_ASYNC) // Game event condition saves PREPARE_STATEMENT(CHAR_DEL_ALL_GAME_EVENT_CONDITION_SAVE, "DELETE FROM game_event_condition_save WHERE eventEntry = ?", CONNECTION_ASYNC) diff --git a/src/server/shared/Debugging/Errors.h b/src/server/shared/Debugging/Errors.h index bee4b556f2e..cfa1452864f 100755 --- a/src/server/shared/Debugging/Errors.h +++ b/src/server/shared/Debugging/Errors.h @@ -24,9 +24,9 @@ #include #define WPAssert( assertion ) { if (!(assertion)) { ACE_Stack_Trace st; sLog->outError( "\n%s:%i in %s ASSERTION FAILED:\n %s\n%s\n", __FILE__, __LINE__, __FUNCTION__, #assertion, st.c_str()); assert( #assertion &&0 ); ((void(*)())NULL)();} } -#define WPError( assertion, errmsg ) if( ! (assertion) ) { sLog->outError( "%\n%s:%i in %s ERROR:\n %s\n", __FILE__, __LINE__, __FUNCTION__, (char *)errmsg ); assert( false ); } -#define WPWarning( assertion, errmsg ) if( ! (assertion) ) { sLog->outError( "\n%s:%i in %s WARNING:\n %s\n", __FILE__, __LINE__, __FUNCTION__, (char *)errmsg ); } -#define WPFatal( assertion, errmsg ) if( ! (assertion) ) { sLog->outError( "\n%s:%i in %s FATAL ERROR:\n %s\n", __FILE__, __LINE__, __FUNCTION__, (char *)errmsg ); assert( #assertion &&0 ); abort(); } +#define WPError( assertion, errmsg ) if ( ! (assertion) ) { sLog->outError( "%\n%s:%i in %s ERROR:\n %s\n", __FILE__, __LINE__, __FUNCTION__, (char *)errmsg ); assert( false ); } +#define WPWarning( assertion, errmsg ) if ( ! (assertion) ) { sLog->outError( "\n%s:%i in %s WARNING:\n %s\n", __FILE__, __LINE__, __FUNCTION__, (char *)errmsg ); } +#define WPFatal( assertion, errmsg ) if ( ! (assertion) ) { sLog->outError( "\n%s:%i in %s FATAL ERROR:\n %s\n", __FILE__, __LINE__, __FUNCTION__, (char *)errmsg ); assert( #assertion &&0 ); abort(); } #define ASSERT WPAssert #endif diff --git a/src/server/shared/Debugging/WheatyExceptionReport.cpp b/src/server/shared/Debugging/WheatyExceptionReport.cpp index c2c3ec95e93..63648f66e29 100644 --- a/src/server/shared/Debugging/WheatyExceptionReport.cpp +++ b/src/server/shared/Debugging/WheatyExceptionReport.cpp @@ -399,7 +399,7 @@ void WheatyExceptionReport::printTracesForAllThreads() } CloseHandle(threadHandle); } - } while(Thread32Next(hThreadSnap, &te32)); + } while (Thread32Next(hThreadSnap, &te32)); // Don't forget to clean up the snapshot object. CloseHandle(hThreadSnap); @@ -470,7 +470,7 @@ PEXCEPTION_POINTERS pExceptionInfo) _tprintf(_T("RAX:%016I64X\r\nRBX:%016I64X\r\nRCX:%016I64X\r\nRDX:%016I64X\r\nRSI:%016I64X\r\nRDI:%016I64X\r\n") _T("R8: %016I64X\r\nR9: %016I64X\r\nR10:%016I64X\r\nR11:%016I64X\r\nR12:%016I64X\r\nR13:%016I64X\r\nR14:%016I64X\r\nR15:%016I64X\r\n") , pCtx->Rax, pCtx->Rbx, pCtx->Rcx, pCtx->Rdx, - pCtx->Rsi, pCtx->Rdi , pCtx->R9, pCtx->R10, pCtx->R11, pCtx->R12, pCtx->R13, pCtx->R14, pCtx->R15); + pCtx->Rsi, pCtx->Rdi, pCtx->R9, pCtx->R10, pCtx->R11, pCtx->R12, pCtx->R13, pCtx->R14, pCtx->R15); _tprintf(_T("CS:RIP:%04X:%016I64X\r\n"), pCtx->SegCs, pCtx->Rip); _tprintf(_T("SS:RSP:%04X:%016X RBP:%08X\r\n"), pCtx->SegSs, pCtx->Rsp, pCtx->Rbp); diff --git a/src/server/shared/Debugging/WheatyExceptionReport.h b/src/server/shared/Debugging/WheatyExceptionReport.h index cc77a598e67..8ade80ca47b 100644 --- a/src/server/shared/Debugging/WheatyExceptionReport.h +++ b/src/server/shared/Debugging/WheatyExceptionReport.h @@ -100,7 +100,7 @@ class WheatyExceptionReport static bool FormatSymbolValue(PSYMBOL_INFO, STACKFRAME *, char * pszBuffer, unsigned cbBuffer); - static char * DumpTypeIndex(char *, DWORD64, DWORD, unsigned, DWORD_PTR, bool & , char*); + static char * DumpTypeIndex(char *, DWORD64, DWORD, unsigned, DWORD_PTR, bool &, char*); static char * FormatOutputValue(char * pszCurrBuffer, BasicType basicType, DWORD64 length, PVOID pAddress); diff --git a/src/server/shared/Dynamic/LinkedList.h b/src/server/shared/Dynamic/LinkedList.h index 95e7261405d..19a2bb1c8cf 100755 --- a/src/server/shared/Dynamic/LinkedList.h +++ b/src/server/shared/Dynamic/LinkedList.h @@ -51,7 +51,7 @@ class LinkedListElement void delink() { - if(isInList()) + if (isInList()) { iNext->iPrev = iPrev; iPrev->iNext = iNext; iNext = NULL; iPrev = NULL; } @@ -112,11 +112,11 @@ class LinkedListHead uint32 getSize() const { - if(!iSize) + if (!iSize) { uint32 result = 0; LinkedListElement const* e = getFirst(); - while(e) + while (e) { ++result; e = e->next(); diff --git a/src/server/shared/Dynamic/LinkedReference/RefManager.h b/src/server/shared/Dynamic/LinkedReference/RefManager.h index da8cf518de5..ab56de9bc24 100755 --- a/src/server/shared/Dynamic/LinkedReference/RefManager.h +++ b/src/server/shared/Dynamic/LinkedReference/RefManager.h @@ -43,7 +43,7 @@ template class RefManager : public LinkedListHead void clearReferences() { LinkedListElement* ref; - while((ref = getFirst()) != NULL) + while ((ref = getFirst()) != NULL) { ((Reference*) ref)->invalidate(); ref->delink(); // the delink might be already done by invalidate(), but doing it here again does not hurt and insures an empty list diff --git a/src/server/shared/Dynamic/LinkedReference/Reference.h b/src/server/shared/Dynamic/LinkedReference/Reference.h index 8570b3e1f1f..fd5ce8fc25b 100755 --- a/src/server/shared/Dynamic/LinkedReference/Reference.h +++ b/src/server/shared/Dynamic/LinkedReference/Reference.h @@ -45,9 +45,9 @@ template class Reference : public LinkedListElement void link(TO* toObj, FROM* fromObj) { assert(fromObj); // fromObj MUST not be NULL - if(isValid()) + if (isValid()) unlink(); - if(toObj != NULL) + if (toObj != NULL) { iRefTo = toObj; iRefFrom = fromObj; diff --git a/src/server/shared/Dynamic/ObjectRegistry.h b/src/server/shared/Dynamic/ObjectRegistry.h index da255d40e86..db5e28eff8f 100755 --- a/src/server/shared/Dynamic/ObjectRegistry.h +++ b/src/server/shared/Dynamic/ObjectRegistry.h @@ -46,9 +46,9 @@ class ObjectRegistry bool InsertItem(T *obj, Key key, bool override = false) { typename RegistryMapType::iterator iter = i_registeredObjects.find(key); - if( iter != i_registeredObjects.end() ) + if ( iter != i_registeredObjects.end() ) { - if( !override ) + if ( !override ) return false; delete iter->second; i_registeredObjects.erase(iter); @@ -62,9 +62,9 @@ class ObjectRegistry void RemoveItem(Key key, bool delete_object = true) { typename RegistryMapType::iterator iter = i_registeredObjects.find(key); - if( iter != i_registeredObjects.end() ) + if ( iter != i_registeredObjects.end() ) { - if( delete_object ) + if ( delete_object ) delete iter->second; i_registeredObjects.erase(iter); } diff --git a/src/server/shared/Dynamic/TypeContainerFunctionsPtr.h b/src/server/shared/Dynamic/TypeContainerFunctionsPtr.h index 9b43e325806..7b03f8503b5 100755 --- a/src/server/shared/Dynamic/TypeContainerFunctionsPtr.h +++ b/src/server/shared/Dynamic/TypeContainerFunctionsPtr.h @@ -101,7 +101,7 @@ namespace Trinity template CountedPtr& Find(const ContainerMapList >&elements, OBJECT_HANDLE hdl, CountedPtr* fake) { CountedPtr &t = Find(elements._elements, hdl, fake); - if(!t) + if (!t) t = Find(elements._TailElement, hdl, fake); return t; @@ -136,7 +136,7 @@ namespace Trinity template bool Remove(ContainerMapList &elements, CountedPtr &obj, OBJECT_HANDLE hdl) { typename std::map >::iterator iter = elements._element.find(hdl); - if( iter != elements._element.end() ) + if ( iter != elements._element.end() ) { elements._element.erase(iter); return true; diff --git a/src/server/shared/Logging/Log.cpp b/src/server/shared/Logging/Log.cpp index 04139db4456..56c02a8e77b 100755 --- a/src/server/shared/Logging/Log.cpp +++ b/src/server/shared/Logging/Log.cpp @@ -38,11 +38,11 @@ Log::Log() : Log::~Log() { - if( logfile != NULL ) + if ( logfile != NULL ) fclose(logfile); logfile = NULL; - if( gmLogfile != NULL ) + if ( gmLogfile != NULL ) fclose(gmLogfile); gmLogfile = NULL; @@ -50,7 +50,7 @@ Log::~Log() fclose(charLogfile); charLogfile = NULL; - if( dberLogfile != NULL ) + if ( dberLogfile != NULL ) fclose(dberLogfile); dberLogfile = NULL; @@ -129,20 +129,20 @@ void Log::Initialize() InitColors(ConfigMgr::GetStringDefault("LogColors", "")); m_gmlog_per_account = ConfigMgr::GetBoolDefault("GmLogPerAccount", false); - if(!m_gmlog_per_account) + if (!m_gmlog_per_account) gmLogfile = openLogFile("GMLogFile", "GmLogTimestamp", "a"); else { // GM log settings for per account case m_gmlog_filename_format = ConfigMgr::GetStringDefault("GMLogFile", ""); - if(!m_gmlog_filename_format.empty()) + if (!m_gmlog_filename_format.empty()) { bool m_gmlog_timestamp = ConfigMgr::GetBoolDefault("GmLogTimestamp", false); size_t dot_pos = m_gmlog_filename_format.find_last_of("."); - if(dot_pos!=m_gmlog_filename_format.npos) + if (dot_pos!=m_gmlog_filename_format.npos) { - if(m_gmlog_timestamp) + if (m_gmlog_timestamp) m_gmlog_filename_format.insert(dot_pos, m_logsTimestamp); m_gmlog_filename_format.insert(dot_pos, "_#%u"); @@ -151,7 +151,7 @@ void Log::Initialize() { m_gmlog_filename_format += "_#%u"; - if(m_gmlog_timestamp) + if (m_gmlog_timestamp) m_gmlog_filename_format += m_logsTimestamp; } @@ -199,13 +199,13 @@ void Log::ReloadConfig() FILE* Log::openLogFile(char const* configFileName, char const* configTimeStampFlag, char const* mode) { std::string logfn=ConfigMgr::GetStringDefault(configFileName, ""); - if(logfn.empty()) + if (logfn.empty()) return NULL; - if(configTimeStampFlag && ConfigMgr::GetBoolDefault(configTimeStampFlag, false)) + if (configTimeStampFlag && ConfigMgr::GetBoolDefault(configTimeStampFlag, false)) { size_t dot_pos = logfn.find_last_of("."); - if(dot_pos!=logfn.npos) + if (dot_pos!=logfn.npos) logfn.insert(dot_pos, m_logsTimestamp); else logfn += m_logsTimestamp; @@ -216,7 +216,7 @@ FILE* Log::openLogFile(char const* configFileName, char const* configTimeStampFl FILE* Log::openGmlogPerAccount(uint32 account) { - if(m_gmlog_filename_format.empty()) + if (m_gmlog_filename_format.empty()) return NULL; char namebuf[TRINITY_PATH_MAX]; @@ -239,7 +239,7 @@ void Log::outTimestamp(FILE* file) void Log::InitColors(const std::string& str) { - if(str.empty()) + if (str.empty()) { m_colored = false; return; @@ -253,10 +253,10 @@ void Log::InitColors(const std::string& str) { ss >> color[i]; - if(!ss) + if (!ss) return; - if(color[i] < 0 || color[i] >= Colors) + if (color[i] < 0 || color[i] >= Colors) return; } @@ -412,7 +412,7 @@ void Log::outString(const char * str, ...) ResetColor(true); printf("\n"); - if(logfile) + if (logfile) { outTimestamp(logfile); va_start(ap, str); @@ -715,7 +715,7 @@ void Log::outDebugInLine(const char * str, ...) vutf8printf(stdout, str, &ap); va_end(ap); - //if(m_colored) + //if (m_colored) // ResetColor(true); if (logfile) @@ -772,7 +772,7 @@ void Log::outDebug(DebugLogFilters f, const char * str, ...) va_end(ap2); } - if( m_logLevel > LOGL_DETAIL ) + if ( m_logLevel > LOGL_DETAIL ) { if (m_colored) SetColor(true, m_colors[LOGL_DEBUG]); @@ -782,7 +782,7 @@ void Log::outDebug(DebugLogFilters f, const char * str, ...) vutf8printf(stdout, str, &ap); va_end(ap); - if(m_colored) + if (m_colored) ResetColor(true); printf( "\n" ); @@ -817,7 +817,7 @@ void Log::outStaticDebug(const char * str, ...) va_end(ap2); } - if( m_logLevel > LOGL_DETAIL ) + if ( m_logLevel > LOGL_DETAIL ) { if (m_colored) SetColor(true, m_colors[LOGL_DEBUG]); @@ -827,7 +827,7 @@ void Log::outStaticDebug(const char * str, ...) vutf8printf(stdout, str, &ap); va_end(ap); - if(m_colored) + if (m_colored) ResetColor(true); printf( "\n" ); diff --git a/src/server/shared/Packets/ByteBuffer.h b/src/server/shared/Packets/ByteBuffer.h index 4db410d3876..08318aa7a5b 100755 --- a/src/server/shared/Packets/ByteBuffer.h +++ b/src/server/shared/Packets/ByteBuffer.h @@ -270,7 +270,7 @@ class ByteBuffer void read_skip(size_t skip) { - if(_rpos + skip > size()) + if (_rpos + skip > size()) throw ByteBufferException(false, _rpos, skip, size()); _rpos += skip; } @@ -284,7 +284,7 @@ class ByteBuffer template T read(size_t pos) const { - if(pos + sizeof(T) > size()) + if (pos + sizeof(T) > size()) throw ByteBufferException(false, pos, sizeof(T), size()); T val = *((T const*)&_storage[pos]); EndianConvert(val); @@ -293,7 +293,7 @@ class ByteBuffer void read(uint8 *dest, size_t len) { - if(_rpos + len > size()) + if (_rpos + len > size()) throw ByteBufferException(false, _rpos, len, size()); memcpy(dest, &_storage[_rpos], len); _rpos += len; @@ -301,7 +301,7 @@ class ByteBuffer void readPackGUID(uint64& guid) { - if(rpos() + 1 > size()) + if (rpos() + 1 > size()) throw ByteBufferException(false, _rpos, 1, size()); guid = 0; @@ -311,9 +311,9 @@ class ByteBuffer for (int i = 0; i < 8; ++i) { - if(guidmark & (uint8(1) << i)) + if (guidmark & (uint8(1) << i)) { - if(rpos() + 1 > size()) + if (rpos() + 1 > size()) throw ByteBufferException(false, _rpos, 1, size()); uint8 bit; @@ -371,7 +371,7 @@ class ByteBuffer void append(const ByteBuffer& buffer) { - if(buffer.wpos()) + if (buffer.wpos()) append(buffer.contents(), buffer.wpos()); } @@ -390,9 +390,9 @@ class ByteBuffer uint8 packGUID[8+1]; packGUID[0] = 0; size_t size = 1; - for(uint8 i = 0;guid != 0;++i) + for (uint8 i = 0;guid != 0;++i) { - if(guid & 0xFF) + if (guid & 0xFF) { packGUID[0] |= uint8(1 << i); packGUID[size] = uint8(guid & 0xFF); @@ -406,14 +406,14 @@ class ByteBuffer void put(size_t pos, const uint8 *src, size_t cnt) { - if(pos + cnt > size()) + if (pos + cnt > size()) throw ByteBufferException(true, pos, cnt, size()); memcpy(&_storage[pos], src, cnt); } void print_storage() const { - if(!sLog->IsOutDebug()) // optimize disabled debug output + if (!sLog->IsOutDebug()) // optimize disabled debug output return; sLog->outDebug(LOG_FILTER_NETWORKIO, "STORAGE_SIZE: %lu", (unsigned long)size() ); @@ -424,7 +424,7 @@ class ByteBuffer void textlike() const { - if(!sLog->IsOutDebug()) // optimize disabled debug output + if (!sLog->IsOutDebug()) // optimize disabled debug output return; sLog->outDebug(LOG_FILTER_NETWORKIO, "STORAGE_SIZE: %lu", (unsigned long)size() ); @@ -435,7 +435,7 @@ class ByteBuffer void hexlike() const { - if(!sLog->IsOutDebug()) // optimize disabled debug output + if (!sLog->IsOutDebug()) // optimize disabled debug output return; uint32 j = 1, k = 1; @@ -510,7 +510,7 @@ inline ByteBuffer &operator>>(ByteBuffer &b, std::vector &v) uint32 vsize; b >> vsize; v.clear(); - while(vsize--) + while (vsize--) { T t; b >> t; @@ -536,7 +536,7 @@ inline ByteBuffer &operator>>(ByteBuffer &b, std::list &v) uint32 vsize; b >> vsize; v.clear(); - while(vsize--) + while (vsize--) { T t; b >> t; @@ -562,7 +562,7 @@ inline ByteBuffer &operator>>(ByteBuffer &b, std::map &m) uint32 msize; b >> msize; m.clear(); - while(msize--) + while (msize--) { K k; V v; diff --git a/src/server/shared/Threading/LockedQueue.h b/src/server/shared/Threading/LockedQueue.h index 72a916eb295..92eab440684 100755 --- a/src/server/shared/Threading/LockedQueue.h +++ b/src/server/shared/Threading/LockedQueue.h @@ -91,7 +91,7 @@ namespace ACE_Based return false; result = _queue.front(); - if(!check.Process(result)) + if (!check.Process(result)) return false; _queue.pop_front(); diff --git a/src/server/shared/Threading/Threading.cpp b/src/server/shared/Threading/Threading.cpp index 9b72d0f1499..7e22f1afdae 100755 --- a/src/server/shared/Threading/Threading.cpp +++ b/src/server/shared/Threading/Threading.cpp @@ -45,14 +45,14 @@ ThreadPriority::ThreadPriority() ASSERT (!_tmp.empty()); - if(_tmp.size() >= MAXPRIORITYNUM) + if (_tmp.size() >= MAXPRIORITYNUM) { const size_t max_pos = _tmp.size(); size_t min_pos = 1; size_t norm_pos = 0; for (size_t i = 0; i < max_pos; ++i) { - if(_tmp[i] == ACE_THR_PRI_OTHER_DEF) + if (_tmp[i] == ACE_THR_PRI_OTHER_DEF) { norm_pos = i + 1; break; @@ -65,7 +65,7 @@ ThreadPriority::ThreadPriority() //into ¹ piesces const size_t _divider = 4; size_t _div = (norm_pos - min_pos) / _divider; - if(_div == 0) + if (_div == 0) _div = 1; min_pos = (norm_pos - 1); @@ -74,7 +74,7 @@ ThreadPriority::ThreadPriority() m_priority[Lowest] = _tmp[min_pos -= _div ]; _div = (max_pos - norm_pos) / _divider; - if(_div == 0) + if (_div == 0) _div = 1; min_pos = norm_pos - 1; @@ -86,10 +86,10 @@ ThreadPriority::ThreadPriority() int ThreadPriority::getPriority(Priority p) const { - if(p < Idle) + if (p < Idle) p = Idle; - if(p > Realtime) + if (p > Realtime) p = Realtime; return m_priority[p]; @@ -204,14 +204,14 @@ ACE_hthread_t Thread::currentHandle() Thread * Thread::current() { Thread * _thread = m_ThreadStorage.ts_object(); - if(!_thread) + if (!_thread) { _thread = new Thread(); _thread->m_iThreadId = Thread::currentId(); _thread->m_hThreadHandle = Thread::currentHandle(); Thread * _oldValue = m_ThreadStorage.ts_object(_thread); - if(_oldValue) + if (_oldValue) delete _oldValue; } diff --git a/src/server/shared/Threading/Threading.h b/src/server/shared/Threading/Threading.h index 0d327d5abaa..89550ec996f 100755 --- a/src/server/shared/Threading/Threading.h +++ b/src/server/shared/Threading/Threading.h @@ -36,7 +36,7 @@ namespace ACE_Based void incReference() { ++m_refs; } void decReference() { - if(!--m_refs) + if (!--m_refs) delete this; } private: diff --git a/src/server/shared/Utilities/EventProcessor.cpp b/src/server/shared/Utilities/EventProcessor.cpp index 3f9123b3e46..56dcad2516b 100755 --- a/src/server/shared/Utilities/EventProcessor.cpp +++ b/src/server/shared/Utilities/EventProcessor.cpp @@ -71,17 +71,17 @@ void EventProcessor::KillAllEvents(bool force) i_old->second->to_Abort = true; i_old->second->Abort(m_time); - if(force || i_old->second->IsDeletable()) + if (force || i_old->second->IsDeletable()) { delete i_old->second; - if(!force) // need per-element cleanup + if (!force) // need per-element cleanup m_events.erase (i_old); } } // fast clear event list (in force case) - if(force) + if (force) m_events.clear(); } diff --git a/src/server/shared/Utilities/ServiceWin32.cpp b/src/server/shared/Utilities/ServiceWin32.cpp index f768a3ab68c..cd623c62132 100755 --- a/src/server/shared/Utilities/ServiceWin32.cpp +++ b/src/server/shared/Utilities/ServiceWin32.cpp @@ -80,7 +80,7 @@ bool WinServiceInstall() if (service) { advapi32 = GetModuleHandle("ADVAPI32.DLL"); - if(!advapi32) + if (!advapi32) { CloseServiceHandle(service); CloseServiceHandle(serviceControlManager); @@ -232,7 +232,7 @@ void WINAPI ServiceMain(DWORD argc, char *argv[]) m_ServiceStatus = 1; argc = 1; - main(argc , argv); + main(argc, argv); // service was stopped serviceStatus.dwCurrentState = SERVICE_STOP_PENDING; diff --git a/src/server/shared/Utilities/Util.cpp b/src/server/shared/Utilities/Util.cpp index 7d3a6f7ed58..187258e41b3 100755 --- a/src/server/shared/Utilities/Util.cpp +++ b/src/server/shared/Utilities/Util.cpp @@ -128,9 +128,9 @@ void stripLineInvisibleChars(std::string &str) bool space = false; for (size_t pos = 0; pos < str.size(); ++pos) { - if(invChars.find(str[pos])!=std::string::npos) + if (invChars.find(str[pos])!=std::string::npos) { - if(!space) + if (!space) { str[wpos++] = ' '; space = true; @@ -138,7 +138,7 @@ void stripLineInvisibleChars(std::string &str) } else { - if(wpos!=pos) + if (wpos!=pos) str[wpos++] = str[pos]; else ++wpos; @@ -146,9 +146,9 @@ void stripLineInvisibleChars(std::string &str) } } - if(wpos < str.size()) + if (wpos < str.size()) str.erase(wpos, str.size()); - if(str.find("|TInterface")!=std::string::npos) + if (str.find("|TInterface")!=std::string::npos) str.clear(); } @@ -161,15 +161,15 @@ std::string secsToTimeString(uint64 timeInSecs, bool shortText, bool hoursOnly) uint64 days = timeInSecs / DAY; std::ostringstream ss; - if(days) + if (days) ss << days << (shortText ? "d " : " Day(s) "); - if(hours || hoursOnly) + if (hours || hoursOnly) ss << hours << (shortText ? "h " : " Hour(s) "); - if(!hoursOnly) + if (!hoursOnly) { - if(minutes) + if (minutes) ss << minutes << (shortText ? "m " : " Minute(s) "); - if(secs || (!days && !hours && !minutes) ) + if (secs || (!days && !hours && !minutes) ) ss << secs << (shortText ? "s" : " Second(s)."); } @@ -184,14 +184,14 @@ uint32 TimeStringToSecs(const std::string& timestring) for (std::string::const_iterator itr = timestring.begin(); itr != timestring.end(); ++itr) { - if(isdigit(*itr)) + if (isdigit(*itr)) { buffer*=10; buffer+= (*itr)-'0'; } else { - switch(*itr) + switch (*itr) { case 'd': multiplier = DAY; break; case 'h': multiplier = HOUR; break; @@ -225,7 +225,7 @@ std::string TimeToTimestampStr(time_t t) /// Check if the string is a valid ip address representation bool IsIPAddress(char const* ipaddress) { - if(!ipaddress) + if (!ipaddress) return false; // Let the big boys do it. @@ -270,7 +270,7 @@ void utf8truncate(std::string& utf8str, size_t len) try { size_t wlen = utf8::distance(utf8str.c_str(), utf8str.c_str()+utf8str.size()); - if(wlen <= len) + if (wlen <= len) return; std::wstring wstr; @@ -291,9 +291,9 @@ bool Utf8toWStr(char const* utf8str, size_t csize, wchar_t* wstr, size_t& wsize) try { size_t len = utf8::distance(utf8str, utf8str+csize); - if(len > wsize) + if (len > wsize) { - if(wsize > 0) + if (wsize > 0) wstr[0] = L'\0'; wsize = 0; return false; @@ -305,7 +305,7 @@ bool Utf8toWStr(char const* utf8str, size_t csize, wchar_t* wstr, size_t& wsize) } catch(std::exception) { - if(wsize > 0) + if (wsize > 0) wstr[0] = L'\0'; wsize = 0; return false; @@ -384,7 +384,7 @@ typedef wchar_t const* const* wstrlist; std::wstring GetMainPartOfName(std::wstring wname, uint32 declension) { // supported only Cyrillic cases - if(wname.size() < 1 || !isCyrillicCharacter(wname[0]) || declension > 5) + if (wname.size() < 1 || !isCyrillicCharacter(wname[0]) || declension > 5) return wname; // Important: end length must be <= MAX_INTERNAL_PLAYER_NAME-MAX_PLAYER_NAME (3 currently) @@ -419,7 +419,7 @@ std::wstring GetMainPartOfName(std::wstring wname, uint32 declension) { size_t len = size_t((*itr)[-1]); // get length from string size field - if(wname.substr(wname.size()-len, len)==*itr) + if (wname.substr(wname.size()-len, len)==*itr) return wname.substr(0, wname.size()-len); } @@ -430,7 +430,7 @@ bool utf8ToConsole(const std::string& utf8str, std::string& conStr) { #if PLATFORM == PLATFORM_WINDOWS std::wstring wstr; - if(!Utf8toWStr(utf8str, wstr)) + if (!Utf8toWStr(utf8str, wstr)) return false; conStr.resize(wstr.size()); @@ -462,13 +462,13 @@ bool Utf8FitTo(const std::string& str, std::wstring search) { std::wstring temp; - if(!Utf8toWStr(str, temp)) + if (!Utf8toWStr(str, temp)) return false; // converting to lower case wstrToLower( temp ); - if(temp.find(search) == std::wstring::npos) + if (temp.find(search) == std::wstring::npos) return false; return true; @@ -509,7 +509,7 @@ void hexEncodeByteArray(uint8* bytes, uint32 arrayLen, std::string& result) { unsigned char nibble = 0x0F & (bytes[i]>>((1-j)*4)); char encodedNibble; - if(nibble < 0x0A) + if (nibble < 0x0A) encodedNibble = '0'+nibble; else encodedNibble = 'A'+nibble-0x0A; diff --git a/src/server/shared/Utilities/Util.h b/src/server/shared/Utilities/Util.h index a91bfe3faa5..8ded45a7bb6 100755 --- a/src/server/shared/Utilities/Util.h +++ b/src/server/shared/Utilities/Util.h @@ -188,60 +188,60 @@ void utf8truncate(std::string& utf8str, size_t len); inline bool isBasicLatinCharacter(wchar_t wchar) { - if(wchar >= L'a' && wchar <= L'z') // LATIN SMALL LETTER A - LATIN SMALL LETTER Z + if (wchar >= L'a' && wchar <= L'z') // LATIN SMALL LETTER A - LATIN SMALL LETTER Z return true; - if(wchar >= L'A' && wchar <= L'Z') // LATIN CAPITAL LETTER A - LATIN CAPITAL LETTER Z + if (wchar >= L'A' && wchar <= L'Z') // LATIN CAPITAL LETTER A - LATIN CAPITAL LETTER Z return true; return false; } inline bool isExtendedLatinCharacter(wchar_t wchar) { - if(isBasicLatinCharacter(wchar)) + if (isBasicLatinCharacter(wchar)) return true; - if(wchar >= 0x00C0 && wchar <= 0x00D6) // LATIN CAPITAL LETTER A WITH GRAVE - LATIN CAPITAL LETTER O WITH DIAERESIS + if (wchar >= 0x00C0 && wchar <= 0x00D6) // LATIN CAPITAL LETTER A WITH GRAVE - LATIN CAPITAL LETTER O WITH DIAERESIS return true; - if(wchar >= 0x00D8 && wchar <= 0x00DF) // LATIN CAPITAL LETTER O WITH STROKE - LATIN CAPITAL LETTER THORN + if (wchar >= 0x00D8 && wchar <= 0x00DF) // LATIN CAPITAL LETTER O WITH STROKE - LATIN CAPITAL LETTER THORN return true; - if(wchar == 0x00DF) // LATIN SMALL LETTER SHARP S + if (wchar == 0x00DF) // LATIN SMALL LETTER SHARP S return true; - if(wchar >= 0x00E0 && wchar <= 0x00F6) // LATIN SMALL LETTER A WITH GRAVE - LATIN SMALL LETTER O WITH DIAERESIS + if (wchar >= 0x00E0 && wchar <= 0x00F6) // LATIN SMALL LETTER A WITH GRAVE - LATIN SMALL LETTER O WITH DIAERESIS return true; - if(wchar >= 0x00F8 && wchar <= 0x00FE) // LATIN SMALL LETTER O WITH STROKE - LATIN SMALL LETTER THORN + if (wchar >= 0x00F8 && wchar <= 0x00FE) // LATIN SMALL LETTER O WITH STROKE - LATIN SMALL LETTER THORN return true; - if(wchar >= 0x0100 && wchar <= 0x012F) // LATIN CAPITAL LETTER A WITH MACRON - LATIN SMALL LETTER I WITH OGONEK + if (wchar >= 0x0100 && wchar <= 0x012F) // LATIN CAPITAL LETTER A WITH MACRON - LATIN SMALL LETTER I WITH OGONEK return true; - if(wchar == 0x1E9E) // LATIN CAPITAL LETTER SHARP S + if (wchar == 0x1E9E) // LATIN CAPITAL LETTER SHARP S return true; return false; } inline bool isCyrillicCharacter(wchar_t wchar) { - if(wchar >= 0x0410 && wchar <= 0x044F) // CYRILLIC CAPITAL LETTER A - CYRILLIC SMALL LETTER YA + if (wchar >= 0x0410 && wchar <= 0x044F) // CYRILLIC CAPITAL LETTER A - CYRILLIC SMALL LETTER YA return true; - if(wchar == 0x0401 || wchar == 0x0451) // CYRILLIC CAPITAL LETTER IO, CYRILLIC SMALL LETTER IO + if (wchar == 0x0401 || wchar == 0x0451) // CYRILLIC CAPITAL LETTER IO, CYRILLIC SMALL LETTER IO return true; return false; } inline bool isEastAsianCharacter(wchar_t wchar) { - if(wchar >= 0x1100 && wchar <= 0x11F9) // Hangul Jamo + if (wchar >= 0x1100 && wchar <= 0x11F9) // Hangul Jamo return true; - if(wchar >= 0x3041 && wchar <= 0x30FF) // Hiragana + Katakana + if (wchar >= 0x3041 && wchar <= 0x30FF) // Hiragana + Katakana return true; - if(wchar >= 0x3131 && wchar <= 0x318E) // Hangul Compatibility Jamo + if (wchar >= 0x3131 && wchar <= 0x318E) // Hangul Compatibility Jamo return true; - if(wchar >= 0x31F0 && wchar <= 0x31FF) // Katakana Phonetic Ext. + if (wchar >= 0x31F0 && wchar <= 0x31FF) // Katakana Phonetic Ext. return true; - if(wchar >= 0x3400 && wchar <= 0x4DB5) // CJK Ideographs Ext. A + if (wchar >= 0x3400 && wchar <= 0x4DB5) // CJK Ideographs Ext. A return true; - if(wchar >= 0x4E00 && wchar <= 0x9FC3) // Unified CJK Ideographs + if (wchar >= 0x4E00 && wchar <= 0x9FC3) // Unified CJK Ideographs return true; - if(wchar >= 0xAC00 && wchar <= 0xD7A3) // Hangul Syllables + if (wchar >= 0xAC00 && wchar <= 0xD7A3) // Hangul Syllables return true; - if(wchar >= 0xFF01 && wchar <= 0xFFEE) // Halfwidth forms + if (wchar >= 0xFF01 && wchar <= 0xFFEE) // Halfwidth forms return true; return false; } @@ -273,7 +273,7 @@ inline bool isNumericOrSpace(wchar_t wchar) inline bool isBasicLatinString(std::wstring wstr, bool numericOrSpace) { for (size_t i = 0; i < wstr.size(); ++i) - if(!isBasicLatinCharacter(wstr[i]) && (!numericOrSpace || !isNumericOrSpace(wstr[i]))) + if (!isBasicLatinCharacter(wstr[i]) && (!numericOrSpace || !isNumericOrSpace(wstr[i]))) return false; return true; } @@ -281,7 +281,7 @@ inline bool isBasicLatinString(std::wstring wstr, bool numericOrSpace) inline bool isExtendedLatinString(std::wstring wstr, bool numericOrSpace) { for (size_t i = 0; i < wstr.size(); ++i) - if(!isExtendedLatinCharacter(wstr[i]) && (!numericOrSpace || !isNumericOrSpace(wstr[i]))) + if (!isExtendedLatinCharacter(wstr[i]) && (!numericOrSpace || !isNumericOrSpace(wstr[i]))) return false; return true; } @@ -289,7 +289,7 @@ inline bool isExtendedLatinString(std::wstring wstr, bool numericOrSpace) inline bool isCyrillicString(std::wstring wstr, bool numericOrSpace) { for (size_t i = 0; i < wstr.size(); ++i) - if(!isCyrillicCharacter(wstr[i]) && (!numericOrSpace || !isNumericOrSpace(wstr[i]))) + if (!isCyrillicCharacter(wstr[i]) && (!numericOrSpace || !isNumericOrSpace(wstr[i]))) return false; return true; } @@ -297,29 +297,29 @@ inline bool isCyrillicString(std::wstring wstr, bool numericOrSpace) inline bool isEastAsianString(std::wstring wstr, bool numericOrSpace) { for (size_t i = 0; i < wstr.size(); ++i) - if(!isEastAsianCharacter(wstr[i]) && (!numericOrSpace || !isNumericOrSpace(wstr[i]))) + if (!isEastAsianCharacter(wstr[i]) && (!numericOrSpace || !isNumericOrSpace(wstr[i]))) return false; return true; } inline wchar_t wcharToUpper(wchar_t wchar) { - if(wchar >= L'a' && wchar <= L'z') // LATIN SMALL LETTER A - LATIN SMALL LETTER Z + if (wchar >= L'a' && wchar <= L'z') // LATIN SMALL LETTER A - LATIN SMALL LETTER Z return wchar_t(uint16(wchar)-0x0020); - if(wchar == 0x00DF) // LATIN SMALL LETTER SHARP S + if (wchar == 0x00DF) // LATIN SMALL LETTER SHARP S return wchar_t(0x1E9E); - if(wchar >= 0x00E0 && wchar <= 0x00F6) // LATIN SMALL LETTER A WITH GRAVE - LATIN SMALL LETTER O WITH DIAERESIS + if (wchar >= 0x00E0 && wchar <= 0x00F6) // LATIN SMALL LETTER A WITH GRAVE - LATIN SMALL LETTER O WITH DIAERESIS return wchar_t(uint16(wchar)-0x0020); - if(wchar >= 0x00F8 && wchar <= 0x00FE) // LATIN SMALL LETTER O WITH STROKE - LATIN SMALL LETTER THORN + if (wchar >= 0x00F8 && wchar <= 0x00FE) // LATIN SMALL LETTER O WITH STROKE - LATIN SMALL LETTER THORN return wchar_t(uint16(wchar)-0x0020); - if(wchar >= 0x0101 && wchar <= 0x012F) // LATIN SMALL LETTER A WITH MACRON - LATIN SMALL LETTER I WITH OGONEK (only %2=1) + if (wchar >= 0x0101 && wchar <= 0x012F) // LATIN SMALL LETTER A WITH MACRON - LATIN SMALL LETTER I WITH OGONEK (only %2=1) { - if(wchar % 2 == 1) + if (wchar % 2 == 1) return wchar_t(uint16(wchar)-0x0001); } - if(wchar >= 0x0430 && wchar <= 0x044F) // CYRILLIC SMALL LETTER A - CYRILLIC SMALL LETTER YA + if (wchar >= 0x0430 && wchar <= 0x044F) // CYRILLIC SMALL LETTER A - CYRILLIC SMALL LETTER YA return wchar_t(uint16(wchar)-0x0020); - if(wchar == 0x0451) // CYRILLIC SMALL LETTER IO + if (wchar == 0x0451) // CYRILLIC SMALL LETTER IO return wchar_t(0x0401); return wchar; @@ -332,22 +332,22 @@ inline wchar_t wcharToUpperOnlyLatin(wchar_t wchar) inline wchar_t wcharToLower(wchar_t wchar) { - if(wchar >= L'A' && wchar <= L'Z') // LATIN CAPITAL LETTER A - LATIN CAPITAL LETTER Z + if (wchar >= L'A' && wchar <= L'Z') // LATIN CAPITAL LETTER A - LATIN CAPITAL LETTER Z return wchar_t(uint16(wchar)+0x0020); - if(wchar >= 0x00C0 && wchar <= 0x00D6) // LATIN CAPITAL LETTER A WITH GRAVE - LATIN CAPITAL LETTER O WITH DIAERESIS + if (wchar >= 0x00C0 && wchar <= 0x00D6) // LATIN CAPITAL LETTER A WITH GRAVE - LATIN CAPITAL LETTER O WITH DIAERESIS return wchar_t(uint16(wchar)+0x0020); - if(wchar >= 0x00D8 && wchar <= 0x00DE) // LATIN CAPITAL LETTER O WITH STROKE - LATIN CAPITAL LETTER THORN + if (wchar >= 0x00D8 && wchar <= 0x00DE) // LATIN CAPITAL LETTER O WITH STROKE - LATIN CAPITAL LETTER THORN return wchar_t(uint16(wchar)+0x0020); - if(wchar >= 0x0100 && wchar <= 0x012E) // LATIN CAPITAL LETTER A WITH MACRON - LATIN CAPITAL LETTER I WITH OGONEK (only %2=0) + if (wchar >= 0x0100 && wchar <= 0x012E) // LATIN CAPITAL LETTER A WITH MACRON - LATIN CAPITAL LETTER I WITH OGONEK (only %2=0) { - if(wchar % 2 == 0) + if (wchar % 2 == 0) return wchar_t(uint16(wchar)+0x0001); } - if(wchar == 0x1E9E) // LATIN CAPITAL LETTER SHARP S + if (wchar == 0x1E9E) // LATIN CAPITAL LETTER SHARP S return wchar_t(0x00DF); - if(wchar == 0x0401) // CYRILLIC CAPITAL LETTER IO + if (wchar == 0x0401) // CYRILLIC CAPITAL LETTER IO return wchar_t(0x0451); - if(wchar >= 0x0410 && wchar <= 0x042F) // CYRILLIC CAPITAL LETTER A - CYRILLIC CAPITAL LETTER YA + if (wchar >= 0x0410 && wchar <= 0x042F) // CYRILLIC CAPITAL LETTER A - CYRILLIC CAPITAL LETTER YA return wchar_t(uint16(wchar)+0x0020); return wchar; -- cgit v1.2.3