From 39603d3e727ac5bc91d030eeea5623ab3a88cc66 Mon Sep 17 00:00:00 2001 From: DarthArgus Date: Mon, 27 Oct 2014 20:13:18 -0700 Subject: [PATCH] start making faster code --- .../3rd/library/platform/utils/Base/MD5.cpp | 2 +- .../3rd/library/platform/utils/Base/MD5.h | 2 +- .../platform/utils/Base/win32/Logger.cpp | 6 ++-- .../CSAssistgameapi/CSAssistgameapicore.cpp | 22 ++++++------ .../CSAssistgameapi/CSAssistgameapicore.h | 6 ++-- .../CSAssist/CSAssistgameapi/packdata.cpp | 4 +-- .../CSAssist/CSAssistgameapi/request.cpp | 34 +++++++++---------- .../CSAssist/CSAssistgameapi/request.h | 30 ++++++++-------- .../CSAssist/utils/Base/Logger.cpp | 6 ++-- .../soePlatform/CSAssist/utils/Base/MD5.cpp | 14 ++++---- .../soePlatform/CSAssist/utils/Base/MD5.h | 18 +++++----- .../CSAssist/utils/Unicode/UnicodeUtils.h | 8 ++--- 12 files changed, 76 insertions(+), 76 deletions(-) diff --git a/external/3rd/library/platform/utils/Base/MD5.cpp b/external/3rd/library/platform/utils/Base/MD5.cpp index e6c6a406..729266dc 100644 --- a/external/3rd/library/platform/utils/Base/MD5.cpp +++ b/external/3rd/library/platform/utils/Base/MD5.cpp @@ -250,7 +250,7 @@ namespace Base } } - void MD5::Update(string s) + void MD5::Update(const string s) { vector achar(s.size(),0); for (int i=0; i<(int)s.size(); i++) diff --git a/external/3rd/library/platform/utils/Base/MD5.h b/external/3rd/library/platform/utils/Base/MD5.h index 04003b6a..78f53b2b 100644 --- a/external/3rd/library/platform/utils/Base/MD5.h +++ b/external/3rd/library/platform/utils/Base/MD5.h @@ -37,7 +37,7 @@ namespace Base std::vector Final(); void Update(char char0); void Update(State & state1, const std::vector &achar0, int i, int j); - void Update(std::string s); + void Update(const std::string s); void Update(const std::vector &achar0); void Update(const std::vector &achar0, int i); void Update(const std::vector &achar0, int i, int j); diff --git a/external/3rd/library/platform/utils/Base/win32/Logger.cpp b/external/3rd/library/platform/utils/Base/win32/Logger.cpp index 9ac86266..cf2afcf6 100644 --- a/external/3rd/library/platform/utils/Base/win32/Logger.cpp +++ b/external/3rd/library/platform/utils/Base/win32/Logger.cpp @@ -58,7 +58,7 @@ Logger::Logger(const char *prefix, int level, unsigned size, bool rollDate) 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) { log((*iter).first, LOG_FILEONLY, "---=== Log Stopped ===---"); fflush((*iter).second->file); @@ -85,7 +85,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); @@ -335,7 +335,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/projects/CSAssist/CSAssistgameapi/CSAssistgameapicore.cpp b/external/3rd/library/soePlatform/CSAssist/projects/CSAssist/CSAssistgameapi/CSAssistgameapicore.cpp index 729fda02..cf85e787 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 || strlen(ticketBody->game) == 0 || strlen(ticketBody->server) == 0 - || strlen(ticketBody->character) == 0 || strlen(ticketBody->details) == 0) + if (uid == 0 || ticketBody == 0 || ticketBody->game[0] != '\0' || ticketBody->server[0] != '\0' + || ticketBody->character[0] != '\0' || ticketBody->details[0] != '\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 0f642423..279fdff2 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 4c267fd4..dbe10c62 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(Plat_Unicode::String s) +CSAssistUnicodeChar *get_c_str(const 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(Plat_Unicode::String s) } //---------------------------------------------- -CSAssistUnicodeChar *copy_c_str(Plat_Unicode::String s, CSAssistUnicodeChar *dest) +CSAssistUnicodeChar *copy_c_str(const Plat_Unicode::String &s, CSAssistUnicodeChar *dest) //---------------------------------------------- { unsigned length = s.size() + 1; diff --git a/external/3rd/library/soePlatform/CSAssist/projects/CSAssist/CSAssistgameapi/request.cpp b/external/3rd/library/soePlatform/CSAssist/projects/CSAssist/CSAssistgameapi/request.cpp index fff9ef31..ad173ec0 100644 --- a/external/3rd/library/soePlatform/CSAssist/projects/CSAssist/CSAssistgameapi/request.cpp +++ b/external/3rd/library/soePlatform/CSAssist/projects/CSAssist/CSAssistgameapi/request.cpp @@ -50,7 +50,7 @@ void Request::pack(ByteStream &msg) //---------------------------------------------- //---------------------------------------------- -RConnectCSAssist::RConnectCSAssist(unsigned track, Plat_Unicode::String GameName, const Plat_Unicode::String ServerName) +RConnectCSAssist::RConnectCSAssist(unsigned track, Plat_Unicode::String GameName, const Plat_Unicode::String &ServerName) : Request(CSASSIST_CALL_CONNECT, track), mGameName(GameName), mServerName(ServerName) @@ -80,7 +80,7 @@ void RConnectCSAssist::pack(ByteStream &msg) } //---------------------------------------------- - RNewTicketActivity::RNewTicketActivity(unsigned track, const unsigned uid, const Plat_Unicode::String character) + RNewTicketActivity::RNewTicketActivity(unsigned track, const unsigned uid, const Plat_Unicode::String &character) : Request(CSASSIST_CALL_NEWTICKETACTIVITY, track), mUID(uid), mCharacter(character) @@ -101,7 +101,7 @@ void RNewTicketActivity::pack(ByteStream &msg) } //---------------------------------------------- - RRegisterCharacter::RRegisterCharacter(unsigned track, const unsigned uid, const Plat_Unicode::String character, const unsigned avaconID) + RRegisterCharacter::RRegisterCharacter(unsigned track, const unsigned uid, const Plat_Unicode::String &character, const unsigned avaconID) : Request(CSASSIST_CALL_REGISTERCHARACTER, track), mUID(uid), mCharacter(character), @@ -124,7 +124,7 @@ void RRegisterCharacter::pack(ByteStream &msg) } //---------------------------------------------- - RUnRegisterCharacter::RUnRegisterCharacter(unsigned track, const unsigned uid, const Plat_Unicode::String character) + RUnRegisterCharacter::RUnRegisterCharacter(unsigned track, const unsigned uid, const Plat_Unicode::String &character) : Request(CSASSIST_CALL_UNREGISTERCHARACTER, track), mUID(uid), mCharacter(character) @@ -145,7 +145,7 @@ void RUnRegisterCharacter::pack(ByteStream &msg) } //---------------------------------------------- - RGetIssueHierarchy::RGetIssueHierarchy(unsigned track, const Plat_Unicode::String version, const Plat_Unicode::String language) + RGetIssueHierarchy::RGetIssueHierarchy(unsigned track, const Plat_Unicode::String &version, const Plat_Unicode::String &language) : Request(CSASSIST_CALL_GETISSUEHIERARCHY, track), mVersion(version), mLanguage(language) @@ -166,7 +166,7 @@ void RGetIssueHierarchy::pack(ByteStream &msg) } //---------------------------------------------- -RCreateTicket::RCreateTicket(unsigned track, const CSAssistGameAPITicket *ticketBody, const Plat_Unicode::String XMLBody, const unsigned uid) +RCreateTicket::RCreateTicket(unsigned track, const CSAssistGameAPITicket *ticketBody, const Plat_Unicode::String &XMLBody, const unsigned uid) : Request(CSASSIST_CALL_CREATETICKET, track), mXMLBody(XMLBody), mUID(uid) @@ -188,7 +188,7 @@ void RCreateTicket::pack(ByteStream &msg) } //---------------------------------------------- -RAppendComment::RAppendComment(unsigned track, const unsigned ticket, const unsigned uid, const Plat_Unicode::String character, const Plat_Unicode::String comment) +RAppendComment::RAppendComment(unsigned track, const unsigned ticket, const unsigned uid, const Plat_Unicode::String &character, const Plat_Unicode::String &comment) : Request(CSASSIST_CALL_APPENDCOMMENT, track), mTicketID(ticket), mUID(uid), @@ -259,7 +259,7 @@ void RGetTicketComments::pack(ByteStream &msg) } //---------------------------------------------- -RGetTicketByCharacter::RGetTicketByCharacter(unsigned track, const unsigned uid, const Plat_Unicode::String character, const unsigned Start, const unsigned Count, const unsigned MarkAsRead) +RGetTicketByCharacter::RGetTicketByCharacter(unsigned track, const unsigned uid, const Plat_Unicode::String &character, const unsigned Start, const unsigned Count, const unsigned MarkAsRead) : Request(CSASSIST_CALL_GETTICKET, track), mUID(uid), mCharacter(character), @@ -305,7 +305,7 @@ void RMarkTicketRead::pack(ByteStream &msg) } //---------------------------------------------- -RCancelTicket::RCancelTicket(unsigned track, const unsigned ticket, const unsigned uid, const Plat_Unicode::String comment) +RCancelTicket::RCancelTicket(unsigned track, const unsigned ticket, const unsigned uid, const Plat_Unicode::String &comment) : Request(CSASSIST_CALL_CANCELTICKET, track), mTicketID(ticket), mUID(uid), @@ -347,7 +347,7 @@ void RCommentCount::pack(ByteStream &msg) } //---------------------------------------------- - RReplyGameLocation::RReplyGameLocation(unsigned track, const unsigned sourceTrack, const unsigned uid, const Plat_Unicode::String character, const unsigned csruid, const Plat_Unicode::String location) + RReplyGameLocation::RReplyGameLocation(unsigned track, const unsigned sourceTrack, const unsigned uid, const Plat_Unicode::String &character, const unsigned csruid, const Plat_Unicode::String &location) : Request(CSASSIST_CALL_REPLYLOCATION, track), mSourceTrack(sourceTrack), mUID(uid), @@ -430,7 +430,7 @@ void RGetTicketXMLBlock::pack(ByteStream &msg) } //---------------------------------------------- - RGetKBArticle::RGetKBArticle(unsigned track, const Plat_Unicode::String id, const Plat_Unicode::String language, const unsigned uid) + RGetKBArticle::RGetKBArticle(unsigned track, const Plat_Unicode::String &id, const Plat_Unicode::String &language, const unsigned uid) : Request(CSASSIST_CALL_GETKBARTICLE, track), mID(id), mLanguage(language), @@ -453,9 +453,9 @@ void RGetKBArticle::pack(ByteStream &msg) } //---------------------------------------------- - RSearchKB::RSearchKB(unsigned track, const Plat_Unicode::String searchstring, const Plat_Unicode::String language, const unsigned uid) + RSearchKB::RSearchKB(unsigned track, const Plat_Unicode::String &searchstring, const Plat_Unicode::String &language, const unsigned uid) : Request(CSASSIST_CALL_SEARCHKB, track), - mSearchString(searchstring), + m&searchstring(&searchstring), mLanguage(language), mUID(uid) //---------------------------------------------- @@ -470,15 +470,15 @@ void RSearchKB::pack(ByteStream &msg) put(msg, num_args); put(msg, mType); put(msg, mTrack); - put(msg, mSearchString); + put(msg, m&searchstring); put(msg, mLanguage); put(msg, mUID); } //---------------------------------------------- -RConnectLB::RConnectLB(unsigned track, const std::string connectString) +RConnectLB::RConnectLB(unsigned track, const std::string &connectString) : Request(CSASSIST_CALL_CONNECTLB, track), -mConnectString(connectString) +m&connectString(&connectString) //---------------------------------------------- { setTimeout(time(0) + 5); @@ -492,7 +492,7 @@ void RConnectLB::pack(ByteStream &msg) put(msg, num_args); put(msg, mType); put(msg, mTrack); - put(msg, mConnectString); + put(msg, m&connectString); } } // namespace CSAssist diff --git a/external/3rd/library/soePlatform/CSAssist/projects/CSAssist/CSAssistgameapi/request.h b/external/3rd/library/soePlatform/CSAssist/projects/CSAssist/CSAssistgameapi/request.h index a3ade508..010a48f5 100644 --- a/external/3rd/library/soePlatform/CSAssist/projects/CSAssist/CSAssistgameapi/request.h +++ b/external/3rd/library/soePlatform/CSAssist/projects/CSAssist/CSAssistgameapi/request.h @@ -96,7 +96,7 @@ class RConnectCSAssist : public Request //---------------------------------------------- { public: - RConnectCSAssist(unsigned track, const Plat_Unicode::String GameName, const Plat_Unicode::String ServerName); + RConnectCSAssist(unsigned track, const Plat_Unicode::String GameName, const Plat_Unicode::String &ServerName); virtual void pack(Base::ByteStream &msg); private: Plat_Unicode::String mGameName; @@ -117,7 +117,7 @@ class RNewTicketActivity : public Request //---------------------------------------------- { public: - RNewTicketActivity(unsigned track, const unsigned uid, const Plat_Unicode::String character); + RNewTicketActivity(unsigned track, const unsigned uid, const Plat_Unicode::String &character); virtual void pack(Base::ByteStream &msg); private: unsigned mUID; @@ -129,7 +129,7 @@ class RRegisterCharacter : public Request //---------------------------------------------- { public: - RRegisterCharacter(unsigned track, const unsigned uid, const Plat_Unicode::String character, const unsigned avaconID); + RRegisterCharacter(unsigned track, const unsigned uid, const Plat_Unicode::String &character, const unsigned avaconID); virtual void pack(Base::ByteStream &msg); private: unsigned mUID; @@ -142,7 +142,7 @@ class RUnRegisterCharacter : public Request //---------------------------------------------- { public: - RUnRegisterCharacter(unsigned track, const unsigned uid, const Plat_Unicode::String character); + RUnRegisterCharacter(unsigned track, const unsigned uid, const Plat_Unicode::String &character); virtual void pack(Base::ByteStream &msg); private: unsigned mUID; @@ -154,7 +154,7 @@ class RGetIssueHierarchy : public Request //---------------------------------------------- { public: - RGetIssueHierarchy(unsigned track, const Plat_Unicode::String version, const Plat_Unicode::String language); + RGetIssueHierarchy(unsigned track, const Plat_Unicode::String &version, const Plat_Unicode::String &language); virtual void pack(Base::ByteStream &msg); private: Plat_Unicode::String mVersion; @@ -166,7 +166,7 @@ class RCreateTicket : public Request //---------------------------------------------- { public: - RCreateTicket(unsigned track, const CSAssistGameAPITicket *ticketBody, const Plat_Unicode::String XMLBody, const unsigned uid); + RCreateTicket(unsigned track, const CSAssistGameAPITicket *ticketBody, const Plat_Unicode::String &XMLBody, const unsigned uid); virtual void pack(Base::ByteStream &msg); private: CSAssistGameAPITicket mTicketStruct; @@ -179,7 +179,7 @@ class RAppendComment : public Request //---------------------------------------------- { public: - RAppendComment(unsigned track, const unsigned ticket, const unsigned uid, const Plat_Unicode::String character, const Plat_Unicode::String comment); + RAppendComment(unsigned track, const unsigned ticket, const unsigned uid, const Plat_Unicode::String &character, const Plat_Unicode::String &comment); virtual void pack(Base::ByteStream &msg); private: unsigned mTicketID; @@ -219,7 +219,7 @@ class RGetTicketByCharacter : public Request //---------------------------------------------- { public: - RGetTicketByCharacter(unsigned track, const unsigned uid, const Plat_Unicode::String character, const unsigned Start, const unsigned Count, const unsigned MarkAsRead); + RGetTicketByCharacter(unsigned track, const unsigned uid, const Plat_Unicode::String &character, const unsigned Start, const unsigned Count, const unsigned MarkAsRead); virtual void pack(Base::ByteStream &msg); private: unsigned mUID; @@ -245,7 +245,7 @@ class RCancelTicket : public Request //---------------------------------------------- { public: - RCancelTicket(unsigned track, const unsigned ticket, const unsigned uid, const Plat_Unicode::String comment); + RCancelTicket(unsigned track, const unsigned ticket, const unsigned uid, const Plat_Unicode::String &comment); virtual void pack(Base::ByteStream &msg); private: unsigned mTicketID; @@ -269,7 +269,7 @@ class RReplyGameLocation : public Request //---------------------------------------------- { public: - RReplyGameLocation(unsigned track, const unsigned sourceTrack, const unsigned uid, const Plat_Unicode::String character, const unsigned csruid, const Plat_Unicode::String locationString); + RReplyGameLocation(unsigned track, const unsigned sourceTrack, const unsigned uid, const Plat_Unicode::String &character, const unsigned csruid, const Plat_Unicode::String locationString); virtual void pack(Base::ByteStream &msg); private: unsigned mSourceTrack; @@ -318,7 +318,7 @@ class RGetKBArticle : public Request //---------------------------------------------- { public: - RGetKBArticle(unsigned track, const Plat_Unicode::String id, const Plat_Unicode::String language, const unsigned uid); + RGetKBArticle(unsigned track, const Plat_Unicode::String &id, const Plat_Unicode::String &language, const unsigned uid); virtual void pack(Base::ByteStream &msg); private: Plat_Unicode::String mID; @@ -331,10 +331,10 @@ class RSearchKB : public Request //---------------------------------------------- { public: - RSearchKB(unsigned track, const Plat_Unicode::String searchstring, const Plat_Unicode::String language, const unsigned uid); + RSearchKB(unsigned track, const Plat_Unicode::String &searchstring, const Plat_Unicode::String &language, const unsigned uid); virtual void pack(Base::ByteStream &msg); private: - Plat_Unicode::String mSearchString; + Plat_Unicode::String m&searchstring; Plat_Unicode::String mLanguage; unsigned mUID; }; @@ -344,10 +344,10 @@ class RConnectLB : public Request //---------------------------------------------- { public: - RConnectLB(unsigned track, const std::string connectString); + RConnectLB(unsigned track, const std::string &connectString); virtual void pack(Base::ByteStream &msg); private: - std::string mConnectString; + std::string m&connectString; }; } // namespace CSAssist diff --git a/external/3rd/library/soePlatform/CSAssist/utils/Base/Logger.cpp b/external/3rd/library/soePlatform/CSAssist/utils/Base/Logger.cpp index 1ce102af..f12db89a 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/Base/MD5.cpp b/external/3rd/library/soePlatform/CSAssist/utils/Base/MD5.cpp index 31d75dcb..1e934c14 100644 --- a/external/3rd/library/soePlatform/CSAssist/utils/Base/MD5.cpp +++ b/external/3rd/library/soePlatform/CSAssist/utils/Base/MD5.cpp @@ -52,7 +52,7 @@ namespace Base Update(input); } - vector MD5::Decode(vector achar0, int i, int j) + vector MD5::Decode(const vector &achar0, int i, int j) { vector ai(16,0); int l; @@ -66,7 +66,7 @@ namespace Base return ai; } - vector MD5::Encode(vector ai, int i) + vector MD5::Encode(const vector &ai, int i) { vector achar0(i,0); int k; @@ -250,7 +250,7 @@ namespace Base } } - void MD5::Update(string s) + void MD5::Update(const string &s) { vector achar(s.size(),0); for (int i=0; i<(int)s.size(); i++) @@ -258,17 +258,17 @@ namespace Base Update( achar, achar.size() ); } - void MD5::Update(vector achar0) + void MD5::Update(const vector &achar0) { Update(achar0, 0, achar0.size()); } - void MD5::Update(vector achar0, int i) + void MD5::Update(const vector &achar0, int i) { Update(state, achar0, 0, i); } - void MD5::Update(vector achar0, int i, int j) + void MD5::Update(const vector &achar0, int i, int j) { Update(state, achar0, i, j); } @@ -278,7 +278,7 @@ namespace Base return asHex(Final()); } - string MD5::asHex(vector achar0) + string MD5::asHex(const vector &achar0) { const string hex = "0123456789abcdef"; diff --git a/external/3rd/library/soePlatform/CSAssist/utils/Base/MD5.h b/external/3rd/library/soePlatform/CSAssist/utils/Base/MD5.h index 935a7ae3..1213aeb6 100644 --- a/external/3rd/library/soePlatform/CSAssist/utils/Base/MD5.h +++ b/external/3rd/library/soePlatform/CSAssist/utils/Base/MD5.h @@ -36,22 +36,22 @@ namespace Base void Init(); std::vector Final(); void Update(char char0); - void Update(State & state1, std::vector achar0, int i, int j); - void Update(std::string s); - void Update(std::vector achar0); - void Update(std::vector achar0, int i); - void Update(std::vector achar0, int i, int j); + void Update(State & state1, const std::vector &achar0, int i, int j); + void Update(const std::string &s); + void Update(const std::vector &achar0); + void Update(const std::vector &achar0, int i); + void Update(const std::vector &achar0, int i, int j); std::string asHex(); - static std::string asHex(std::vector achar0); + static std::string asHex(const std::vector &achar0); private: - std::vector Decode(std::vector achar0, int i, int j); - std::vector Encode(std::vector ai, int i); + std::vector Decode(const std::vector &achar0, int i, int j); + std::vector Encode(const std::vector &ai, int i); int FF(int i, int j, int k, int l, int i1, int j1, int k1); int GG(int i, int j, int k, int l, int i1, int j1, int k1); int HH(int i, int j, int k, int l, int i1, int j1, int k1); int II(int i, int j, int k, int l, int i1, int j1, int k1); - void Transform(State & state1, std::vector achar0, int i); + void Transform(State & state1, const std::vector &achar0, int i); int rotate_left(int i, int j); int uadd(int i, int j); int uadd(int i, int j, int k); diff --git a/external/3rd/library/soePlatform/CSAssist/utils/Unicode/UnicodeUtils.h b/external/3rd/library/soePlatform/CSAssist/utils/Unicode/UnicodeUtils.h index ab466482..0a65f8fc 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; }