From e9fea96e88883aaff0e14ce734e2b434db3dda8a Mon Sep 17 00:00:00 2001 From: DarthArgus Date: Mon, 27 Oct 2014 20:37:48 -0700 Subject: [PATCH] really don't care about csassist --- .../CSAssistgameapi/CSAssistgameapicore.cpp | 22 +++++++++---------- .../CSAssistgameapi/CSAssistgameapicore.h | 6 ++--- .../CSAssist/CSAssistgameapi/packdata.cpp | 4 ++-- .../CSAssist/utils/Base/Logger.cpp | 6 ++--- .../CSAssist/utils/Unicode/UnicodeUtils.h | 8 +++---- 5 files changed, 23 insertions(+), 23 deletions(-) diff --git a/external/3rd/library/soePlatform/CSAssist/projects/CSAssist/CSAssistgameapi/CSAssistgameapicore.cpp b/external/3rd/library/soePlatform/CSAssist/projects/CSAssist/CSAssistgameapi/CSAssistgameapicore.cpp index cf85e787..729fda02 100644 --- a/external/3rd/library/soePlatform/CSAssist/projects/CSAssist/CSAssistgameapi/CSAssistgameapicore.cpp +++ b/external/3rd/library/soePlatform/CSAssist/projects/CSAssist/CSAssistgameapi/CSAssistgameapicore.cpp @@ -138,7 +138,7 @@ CSAssistGameAPIcore::CSAssistGameAPIcore(CSAssistGameAPI *api, const char *serve servers.push_back(p2); p2 = strtok(NULL, delims); } - for (list::iterator iter = servers.begin(); iter != servers.end(); ++iter) + for (list::iterator iter = servers.begin(); iter != servers.end(); iter++) { char *p = new char[iter->size()+1]; memset(p, 0, iter->size()+1); @@ -219,13 +219,13 @@ CSAssistGameAPIcore::~CSAssistGameAPIcore() // ----- clear pending map ----- map::iterator iter; - for(iter = m_pending.begin(); iter != m_pending.end(); ++iter) + for(iter = m_pending.begin(); iter != m_pending.end(); iter++) { delete (*iter).second; } m_pending.clear(); - for(iter = m_pendingInt.begin(); iter != m_pendingInt.end(); ++iter) + for(iter = m_pendingInt.begin(); iter != m_pendingInt.end(); iter++) { delete (*iter).second; } @@ -524,7 +524,7 @@ void CSAssistGameAPIcore::CSAssistGameCallback(Response *response) } //-------------------------------------- -void CSAssistGameAPIcore::localRegisterCharacter(const unsigned uid, const Plat_Unicode::String &character, const unsigned avaconID) +void CSAssistGameAPIcore::localRegisterCharacter(const unsigned uid, const Plat_Unicode::String character, const unsigned avaconID) //-------------------------------------- { //RegisteredCharacter *obj = new RegisteredCharacter(uid, character, avaconID); @@ -534,7 +534,7 @@ void CSAssistGameAPIcore::localRegisterCharacter(const unsigned uid, const Plat_ } //-------------------------------------- -void CSAssistGameAPIcore::localUnRegisterCharacter(const unsigned uid, const Plat_Unicode::String &character) +void CSAssistGameAPIcore::localUnRegisterCharacter(const unsigned uid, const Plat_Unicode::String character) //-------------------------------------- { multimap::iterator iter; @@ -553,7 +553,7 @@ void CSAssistGameAPIcore::localUnRegisterCharacter(const unsigned uid, const Pla m_registeredCharacters.erase(iter); // registered by character string. Erase just this element break; } - ++iter; + iter++; } while (iter != m_registeredCharacters.upper_bound(uid)); } @@ -570,7 +570,7 @@ void CSAssistGameAPIcore::localUnRegisterCharacter(const unsigned uid, const Pla m_registeredCharactersCopy.erase(iter); // registered by character string. Erase just this element break; } - ++iter; + iter++; } while (iter != m_registeredCharactersCopy.upper_bound(uid)); } } @@ -1029,7 +1029,7 @@ void CSAssistGameAPIcore::GetLBHost() m_ip = (*m_curServer).host; m_port = (*m_curServer).port; //fprintf(stderr, "GetLBHost(): host:%s, port:%d\n", m_ip.c_str(), m_port); - ++m_curServer; + m_curServer++; } } @@ -1301,8 +1301,8 @@ CSAssistGameAPITrack CSAssistGameAPIcore::requestCreateTicket(const void *userDa else xml = XMLBody; ResCreateTicket *Res = new ResCreateTicket(m_currTrack, userData); - if (uid == 0 || ticketBody == 0 || ticketBody->game[0] != '\0' || ticketBody->server[0] != '\0' - || ticketBody->character[0] != '\0' || ticketBody->details[0] != '\0') + if (uid == 0 || ticketBody == 0 || strlen(ticketBody->game) == 0 || strlen(ticketBody->server) == 0 + || strlen(ticketBody->character) == 0 || strlen(ticketBody->details) == 0) { SubmitImmediateError(Res); } @@ -1556,7 +1556,7 @@ CSAssistGameAPITrack CSAssistGameAPIcore::requestSearchKB(const void *userData, } //-------------------------------------- -RegisteredCharacter::RegisteredCharacter(const unsigned uid_in, const Plat_Unicode::String &name, const unsigned avacon) +RegisteredCharacter::RegisteredCharacter(const unsigned uid_in, const Plat_Unicode::String name, const unsigned avacon) : uid(uid_in), character(name), avaconID(avacon) //-------------------------------------- { diff --git a/external/3rd/library/soePlatform/CSAssist/projects/CSAssist/CSAssistgameapi/CSAssistgameapicore.h b/external/3rd/library/soePlatform/CSAssist/projects/CSAssist/CSAssistgameapi/CSAssistgameapicore.h index 279fdff2..0f642423 100644 --- a/external/3rd/library/soePlatform/CSAssist/projects/CSAssist/CSAssistgameapi/CSAssistgameapicore.h +++ b/external/3rd/library/soePlatform/CSAssist/projects/CSAssist/CSAssistgameapi/CSAssistgameapicore.h @@ -89,7 +89,7 @@ class RegisteredCharacter { public: - RegisteredCharacter(const unsigned uid, const Plat_Unicode::String &character, const unsigned avaconID); + RegisteredCharacter(const unsigned uid, const Plat_Unicode::String character, const unsigned avaconID); virtual ~RegisteredCharacter(); Plat_Unicode::String getCharacter() { return character; } @@ -144,8 +144,8 @@ public: void Update(); void CSAssistGameCallback(Response *); - void localUnRegisterCharacter(const unsigned uid, const Plat_Unicode::String &character); - void localRegisterCharacter(const unsigned uid, const Plat_Unicode::String &character, const unsigned avaconID); + void localUnRegisterCharacter(const unsigned uid, const Plat_Unicode::String character); + void localRegisterCharacter(const unsigned uid, const Plat_Unicode::String character, const unsigned avaconID); void reregisterCharacters(); bool isInternalTrackingNumber(const unsigned track); void batchRegisterCharacters(const unsigned numToSend); diff --git a/external/3rd/library/soePlatform/CSAssist/projects/CSAssist/CSAssistgameapi/packdata.cpp b/external/3rd/library/soePlatform/CSAssist/projects/CSAssist/CSAssistgameapi/packdata.cpp index dbe10c62..4c267fd4 100644 --- a/external/3rd/library/soePlatform/CSAssist/projects/CSAssist/CSAssistgameapi/packdata.cpp +++ b/external/3rd/library/soePlatform/CSAssist/projects/CSAssist/CSAssistgameapi/packdata.cpp @@ -28,7 +28,7 @@ using namespace Plat_Unicode; //---------------------------------------------- -CSAssistUnicodeChar *get_c_str(const Plat_Unicode::String &s) +CSAssistUnicodeChar *get_c_str(Plat_Unicode::String s) // This replaces c_str() by allocating a new buffer, erasing it, and then // using the non-null terminated data() to copy the data into the buffer. //---------------------------------------------- @@ -41,7 +41,7 @@ CSAssistUnicodeChar *get_c_str(const Plat_Unicode::String &s) } //---------------------------------------------- -CSAssistUnicodeChar *copy_c_str(const Plat_Unicode::String &s, CSAssistUnicodeChar *dest) +CSAssistUnicodeChar *copy_c_str(Plat_Unicode::String s, CSAssistUnicodeChar *dest) //---------------------------------------------- { unsigned length = s.size() + 1; diff --git a/external/3rd/library/soePlatform/CSAssist/utils/Base/Logger.cpp b/external/3rd/library/soePlatform/CSAssist/utils/Base/Logger.cpp index f12db89a..1ce102af 100644 --- a/external/3rd/library/soePlatform/CSAssist/utils/Base/Logger.cpp +++ b/external/3rd/library/soePlatform/CSAssist/utils/Base/Logger.cpp @@ -150,7 +150,7 @@ void Logger::LoggerInit(const char *programName) Logger::~Logger() { map::iterator iter; - for(iter = m_logTable.begin(); iter != m_logTable.end(); ++iter) + for(iter = m_logTable.begin(); iter != m_logTable.end(); iter++) { logWithSys((*iter).first, LOG_INFO, LOG_FILEONLY, "---=== Log Stopped ===---"); fflush((*iter).second->file); @@ -185,7 +185,7 @@ void Logger::flushAll() { map::iterator iter; - for(iter = m_logTable.begin(); iter != m_logTable.end(); ++iter) + for(iter = m_logTable.begin(); iter != m_logTable.end(); iter++) { LogInfo *info = (*iter).second; fflush(info->file); @@ -566,7 +566,7 @@ void Logger::rollDate(time_t t) m_logPrefix = buf; map::iterator iter; - for(iter = m_logTable.begin(); iter != m_logTable.end(); ++iter) + for(iter = m_logTable.begin(); iter != m_logTable.end(); iter++) { (*iter).second->filename = m_logPrefix + file_sep + (*iter).second->name.c_str() + ".log"; fflush((*iter).second->file); diff --git a/external/3rd/library/soePlatform/CSAssist/utils/Unicode/UnicodeUtils.h b/external/3rd/library/soePlatform/CSAssist/utils/Unicode/UnicodeUtils.h index 0a65f8fc..ab466482 100644 --- a/external/3rd/library/soePlatform/CSAssist/utils/Unicode/UnicodeUtils.h +++ b/external/3rd/library/soePlatform/CSAssist/utils/Unicode/UnicodeUtils.h @@ -196,7 +196,7 @@ namespace Plat_Unicode unsigned index = 0; s.resize(nstr.size()); const NarrowString::const_iterator end = nstr.end(); - for (NarrowString::const_iterator iter = nstr.begin(); iter != end; ++iter) + for (NarrowString::const_iterator iter = nstr.begin(); iter != end; iter++) { s[index++] = *iter; } @@ -214,7 +214,7 @@ namespace Plat_Unicode unsigned index = 0; str.resize(nstr.size()); const NarrowString::const_iterator end = nstr.end(); - for (NarrowString::const_iterator iter = nstr.begin(); iter != end; ++iter) + for (NarrowString::const_iterator iter = nstr.begin(); iter != end; iter++) { str[index++] = *iter; } @@ -237,7 +237,7 @@ namespace Plat_Unicode unsigned index = 0; s.resize(str.size()); const String::const_iterator end = str.end(); - for (String::const_iterator iter = str.begin(); iter != end; ++iter) + for (String::const_iterator iter = str.begin(); iter != end; iter++) { s[index++] = (char)*iter; } @@ -259,7 +259,7 @@ namespace Plat_Unicode unsigned index = 0; nstr.resize(str.size()); const String::const_iterator end = str.end(); - for (String::const_iterator iter = str.begin(); iter != end; ++iter) + for (String::const_iterator iter = str.begin(); iter != end; iter++) { nstr[index++] = (char)*iter; }