mirror of
https://github.com/SWG-Source/src.git
synced 2026-07-28 22:15:49 -04:00
more performance fixes
This commit is contained in:
@@ -105,7 +105,7 @@ unsigned ChatAPI::RequestGetAvatarKeywords(const ChatAvatar *srcAvatar, void *us
|
||||
return(m_core->submitRequest(req, res));
|
||||
}
|
||||
|
||||
unsigned ChatAPI::RequestSearchAvatarKeywords(const ChatUnicodeString nodeAddress, const ChatUnicodeString *keywordList, unsigned keywordLength, void *user)
|
||||
unsigned ChatAPI::RequestSearchAvatarKeywords(const ChatUnicodeString &nodeAddress, const ChatUnicodeString *keywordList, unsigned keywordLength, void *user)
|
||||
{
|
||||
RSearchAvatarKeywords *req = new RSearchAvatarKeywords(nodeAddress, keywordList, keywordLength);
|
||||
ResSearchAvatarKeywords *res = new ResSearchAvatarKeywords(user);
|
||||
|
||||
@@ -254,7 +254,7 @@ namespace ChatSystem
|
||||
|
||||
// RequestSearchAvatarKeywords
|
||||
// Searches the keywords on within the chat system and returns a list of avatars that match
|
||||
unsigned RequestSearchAvatarKeywords(const ChatUnicodeString nodeAddress, const ChatUnicodeString *keywordList, unsigned keywordLength, void *user);
|
||||
unsigned RequestSearchAvatarKeywords(const ChatUnicodeString &nodeAddress, const ChatUnicodeString *keywordList, unsigned keywordLength, void *user);
|
||||
|
||||
// ---- FANCLUB handle lookup method ----
|
||||
|
||||
|
||||
+17
-17
@@ -135,25 +135,25 @@ ChatAPICore::~ChatAPICore()
|
||||
m_api = NULL;
|
||||
|
||||
std::map<unsigned, ChatAvatarCore*>::iterator iter = m_avatarCoreCache.begin();
|
||||
for (; iter != m_avatarCoreCache.end(); iter++)
|
||||
for (; iter != m_avatarCoreCache.end(); ++iter)
|
||||
{
|
||||
delete (*iter).second;
|
||||
}
|
||||
|
||||
std::map<unsigned, ChatAvatar*>::iterator iter2 = m_avatarCache.begin();
|
||||
for (; iter2 != m_avatarCache.end(); iter2++)
|
||||
for (; iter2 != m_avatarCache.end(); ++iter2)
|
||||
{
|
||||
delete (*iter2).second;
|
||||
}
|
||||
|
||||
std::map<unsigned, ChatRoomCore*>::iterator iter3 = m_roomCoreCache.begin();
|
||||
for (; iter3 != m_roomCoreCache.end(); iter3++)
|
||||
for (; iter3 != m_roomCoreCache.end(); ++iter3)
|
||||
{
|
||||
delete (*iter3).second;
|
||||
}
|
||||
|
||||
std::map<unsigned, ChatRoom*>::iterator iter4 = m_roomCache.begin();
|
||||
for (; iter4 != m_roomCache.end(); iter4++)
|
||||
for (; iter4 != m_roomCache.end(); ++iter4)
|
||||
{
|
||||
delete (*iter4).second;
|
||||
}
|
||||
@@ -669,7 +669,7 @@ void ChatAPICore::responseCallback(GenericResponse *res)
|
||||
// created that we need to cache as well?
|
||||
const set<ChatRoomCore *> &extraRooms = R->getExtraRooms();
|
||||
set<ChatRoomCore *>::const_iterator iter = extraRooms.begin();
|
||||
for (; iter != extraRooms.end(); iter++)
|
||||
for (; iter != extraRooms.end(); ++iter)
|
||||
{
|
||||
cacheRoom(*iter);
|
||||
}
|
||||
@@ -687,7 +687,7 @@ void ChatAPICore::responseCallback(GenericResponse *res)
|
||||
// the ChatRoomCore objects because we shouldn't need them
|
||||
const set<ChatRoomCore *> &extraRooms = R->getExtraRooms();
|
||||
set<ChatRoomCore *>::const_iterator iter = extraRooms.begin();
|
||||
for (; iter != extraRooms.end(); iter++)
|
||||
for (; iter != extraRooms.end(); ++iter)
|
||||
{
|
||||
delete (*iter);
|
||||
}
|
||||
@@ -727,7 +727,7 @@ void ChatAPICore::responseCallback(GenericResponse *res)
|
||||
// created that we need to cache as well?
|
||||
const set<ChatRoomCore *> &extraRooms = R->getExtraRooms();
|
||||
set<ChatRoomCore *>::const_iterator iter = extraRooms.begin();
|
||||
for (; iter != extraRooms.end(); iter++)
|
||||
for (; iter != extraRooms.end(); ++iter)
|
||||
{
|
||||
cacheRoom(*iter);
|
||||
}
|
||||
@@ -915,7 +915,7 @@ void ChatAPICore::responseCallback(GenericResponse *res)
|
||||
// created that we need to cache as well?
|
||||
const set<ChatRoomCore *> &extraRooms = R->getExtraRooms();
|
||||
set<ChatRoomCore *>::const_iterator iter = extraRooms.begin();
|
||||
for (; iter != extraRooms.end(); iter++)
|
||||
for (; iter != extraRooms.end(); ++iter)
|
||||
{
|
||||
cacheRoom(*iter);
|
||||
}
|
||||
@@ -931,7 +931,7 @@ void ChatAPICore::responseCallback(GenericResponse *res)
|
||||
// the ChatRoomCore objects because we shouldn't need them
|
||||
const set<ChatRoomCore *> &extraRooms = R->getExtraRooms();
|
||||
set<ChatRoomCore *>::const_iterator iter = extraRooms.begin();
|
||||
for (; iter != extraRooms.end(); iter++)
|
||||
for (; iter != extraRooms.end(); ++iter)
|
||||
{
|
||||
delete (*iter);
|
||||
}
|
||||
@@ -2849,7 +2849,7 @@ void ChatAPICore::responseCallback(short type, ByteStream::ReadIterator &iter)
|
||||
|
||||
const set<ChatRoomCore *> &extraRooms = M.getExtraRooms();
|
||||
set<ChatRoomCore *>::const_iterator iter = extraRooms.begin();
|
||||
for (; iter != extraRooms.end(); iter++)
|
||||
for (; iter != extraRooms.end(); ++iter)
|
||||
{
|
||||
if (room)
|
||||
{
|
||||
@@ -2898,7 +2898,7 @@ void ChatAPICore::responseCallback(short type, ByteStream::ReadIterator &iter)
|
||||
{
|
||||
// iterate through rooms, checking if we must fail them over
|
||||
map<unsigned, ChatRoomCore *>::const_iterator roomIter = m_roomCoreCache.begin();
|
||||
for (; roomIter != m_roomCoreCache.end(); roomIter++)
|
||||
for (; roomIter != m_roomCoreCache.end(); ++roomIter)
|
||||
{
|
||||
ChatRoomCore *room = (*roomIter).second;
|
||||
const String &roomAddress = room->getAddress();
|
||||
@@ -2907,7 +2907,7 @@ void ChatAPICore::responseCallback(short type, ByteStream::ReadIterator &iter)
|
||||
// if aid string is found at index 0 (start of roomAddr string)
|
||||
String::size_type index;
|
||||
list<String>::const_iterator aidIter = aidList.begin();
|
||||
for (; aidIter != aidList.end(); aidIter++)
|
||||
for (; aidIter != aidList.end(); ++aidIter)
|
||||
{
|
||||
index = roomAddress.find(*aidIter);
|
||||
if (index == 0)
|
||||
@@ -3183,7 +3183,7 @@ void ChatAPICore::failoverReloginAvatars()
|
||||
|
||||
if (m_avatarCoreCache.size() > 0)
|
||||
{
|
||||
for (avatarIter = m_avatarCoreCache.begin(); avatarIter != m_avatarCoreCache.end(); avatarIter++)
|
||||
for (avatarIter = m_avatarCoreCache.begin(); avatarIter != m_avatarCoreCache.end(); ++avatarIter)
|
||||
{
|
||||
// build failover-login request for avatar
|
||||
failoverReloginOneAvatar(avatarIter->second);
|
||||
@@ -3242,7 +3242,7 @@ void ChatAPICore::failoverRecreateRooms()
|
||||
// first build multimap of rooms keyed by their node level (ascending order is default).
|
||||
multimap<unsigned, ChatRoomCore *> levelMap;
|
||||
ChatRoomCore *roomCore = NULL;
|
||||
for (roomIter = m_roomCoreCache.begin(); roomIter != m_roomCoreCache.end(); roomIter++)
|
||||
for (roomIter = m_roomCoreCache.begin(); roomIter != m_roomCoreCache.end(); ++roomIter)
|
||||
{
|
||||
roomCore = (*roomIter).second;
|
||||
if (roomCore->getNodeLevel() != 0)
|
||||
@@ -3251,7 +3251,7 @@ void ChatAPICore::failoverRecreateRooms()
|
||||
}
|
||||
}
|
||||
|
||||
for (roomMultiIter = levelMap.begin(); roomMultiIter != levelMap.end(); roomMultiIter++)
|
||||
for (roomMultiIter = levelMap.begin(); roomMultiIter != levelMap.end(); ++roomMultiIter)
|
||||
{
|
||||
roomCore = (*roomMultiIter).second;
|
||||
|
||||
@@ -3300,7 +3300,7 @@ ChatAvatar *ChatAPICore::getAvatar(const ChatUnicodeString &avatarName, const Ch
|
||||
|
||||
map<unsigned, ChatAvatar *>::iterator iter = m_avatarCache.begin();
|
||||
|
||||
for (; iter != m_avatarCache.end(); iter++)
|
||||
for (; iter != m_avatarCache.end(); ++iter)
|
||||
{
|
||||
ChatAvatar *avatar = (*iter).second;
|
||||
|
||||
@@ -3321,7 +3321,7 @@ ChatRoom *ChatAPICore::getRoom(const ChatUnicodeString &roomAddress)
|
||||
|
||||
map<unsigned, ChatRoom *>::iterator iter = m_roomCache.begin();
|
||||
|
||||
for (; iter != m_roomCache.end(); iter++)
|
||||
for (; iter != m_roomCache.end(); ++iter)
|
||||
{
|
||||
ChatRoom *room = (*iter).second;
|
||||
|
||||
|
||||
+44
-44
@@ -115,72 +115,72 @@ ChatRoomCore::~ChatRoomCore()
|
||||
set<ChatAvatarCore *>::iterator setIterCore;
|
||||
set<ChatAvatar *>::iterator setIter;
|
||||
|
||||
for (iterCore = m_inroomAvatarsCore.begin(); iterCore != m_inroomAvatarsCore.end(); iterCore++)
|
||||
for (iterCore = m_inroomAvatarsCore.begin(); iterCore != m_inroomAvatarsCore.end(); ++iterCore)
|
||||
{
|
||||
delete (iterCore->second);
|
||||
}
|
||||
|
||||
for (iter = m_inroomAvatars.begin(); iter != m_inroomAvatars.end(); iter++)
|
||||
for (iter = m_inroomAvatars.begin(); iter != m_inroomAvatars.end(); ++iter)
|
||||
{
|
||||
delete (iter->second);
|
||||
}
|
||||
|
||||
for (iterCore = m_adminAvatarsCore.begin(); iterCore != m_adminAvatarsCore.end(); iterCore++)
|
||||
for (iterCore = m_adminAvatarsCore.begin(); iterCore != m_adminAvatarsCore.end(); ++iterCore)
|
||||
{
|
||||
delete (iterCore->second);
|
||||
}
|
||||
|
||||
for (iter = m_adminAvatars.begin(); iter != m_adminAvatars.end(); iter++)
|
||||
for (iter = m_adminAvatars.begin(); iter != m_adminAvatars.end(); ++iter)
|
||||
{
|
||||
delete (iter->second);
|
||||
}
|
||||
|
||||
for (setIterCore = m_moderatorAvatarsCore.begin(); setIterCore != m_moderatorAvatarsCore.end(); setIterCore++)
|
||||
for (setIterCore = m_moderatorAvatarsCore.begin(); setIterCore != m_moderatorAvatarsCore.end(); ++setIterCore)
|
||||
{
|
||||
delete (*setIterCore);
|
||||
}
|
||||
|
||||
for (setIter = m_moderatorAvatars.begin(); setIter != m_moderatorAvatars.end(); setIter++)
|
||||
for (setIter = m_moderatorAvatars.begin(); setIter != m_moderatorAvatars.end(); ++setIter)
|
||||
{
|
||||
delete (*setIter);
|
||||
}
|
||||
|
||||
for (setIterCore = m_tempModeratorAvatarsCore.begin(); setIterCore != m_tempModeratorAvatarsCore.end(); setIterCore++)
|
||||
for (setIterCore = m_tempModeratorAvatarsCore.begin(); setIterCore != m_tempModeratorAvatarsCore.end(); ++setIterCore)
|
||||
{
|
||||
delete (*setIterCore);
|
||||
}
|
||||
|
||||
for (setIter = m_tempModeratorAvatars.begin(); setIter != m_tempModeratorAvatars.end(); setIter++)
|
||||
for (setIter = m_tempModeratorAvatars.begin(); setIter != m_tempModeratorAvatars.end(); ++setIter)
|
||||
{
|
||||
delete (*setIter);
|
||||
}
|
||||
|
||||
for (setIterCore = m_banAvatarsCore.begin(); setIterCore != m_banAvatarsCore.end(); setIterCore++)
|
||||
for (setIterCore = m_banAvatarsCore.begin(); setIterCore != m_banAvatarsCore.end(); ++setIterCore)
|
||||
{
|
||||
delete (*setIterCore);
|
||||
}
|
||||
|
||||
for (setIter = m_banAvatars.begin(); setIter != m_banAvatars.end(); setIter++)
|
||||
for (setIter = m_banAvatars.begin(); setIter != m_banAvatars.end(); ++setIter)
|
||||
{
|
||||
delete (*setIter);
|
||||
}
|
||||
|
||||
for (setIterCore = m_inviteAvatarsCore.begin(); setIterCore != m_inviteAvatarsCore.end(); setIterCore++)
|
||||
for (setIterCore = m_inviteAvatarsCore.begin(); setIterCore != m_inviteAvatarsCore.end(); ++setIterCore)
|
||||
{
|
||||
delete (*setIterCore);
|
||||
}
|
||||
|
||||
for (setIter = m_inviteAvatars.begin(); setIter != m_inviteAvatars.end(); setIter++)
|
||||
for (setIter = m_inviteAvatars.begin(); setIter != m_inviteAvatars.end(); ++setIter)
|
||||
{
|
||||
delete (*setIter);
|
||||
}
|
||||
|
||||
for (setIterCore = m_voiceAvatarsCore.begin(); setIterCore != m_voiceAvatarsCore.end(); setIterCore++)
|
||||
for (setIterCore = m_voiceAvatarsCore.begin(); setIterCore != m_voiceAvatarsCore.end(); ++setIterCore)
|
||||
{
|
||||
delete (*setIterCore);
|
||||
}
|
||||
|
||||
for (setIter = m_voiceAvatars.begin(); setIter != m_voiceAvatars.end(); setIter++)
|
||||
for (setIter = m_voiceAvatars.begin(); setIter != m_voiceAvatars.end(); ++setIter)
|
||||
{
|
||||
delete (*setIter);
|
||||
}
|
||||
@@ -219,7 +219,7 @@ ChatAvatarCore *ChatRoomCore::getModeratorCore(const Plat_Unicode::String &name,
|
||||
|
||||
set<ChatAvatarCore *>::iterator iterCore = m_moderatorAvatarsCore.begin();
|
||||
|
||||
for(; iterCore != m_moderatorAvatarsCore.end(); iterCore++)
|
||||
for(; iterCore != m_moderatorAvatarsCore.end(); ++iterCore)
|
||||
{
|
||||
ChatAvatarCore *avatarCore = (*iterCore);
|
||||
if (caseInsensitiveCompare(name, avatarCore->getName()) &&
|
||||
@@ -242,7 +242,7 @@ ChatAvatar *ChatRoomCore::getModerator(const Plat_Unicode::String &name, const P
|
||||
|
||||
set<ChatAvatar *>::iterator iter = m_moderatorAvatars.begin();
|
||||
|
||||
for(; iter != m_moderatorAvatars.end(); iter++)
|
||||
for(; iter != m_moderatorAvatars.end(); ++iter)
|
||||
{
|
||||
ChatAvatar *avatar = (*iter);
|
||||
Plat_Unicode::String avatarName(avatar->getName().string_data, avatar->getName().string_length);
|
||||
@@ -267,7 +267,7 @@ ChatAvatarCore *ChatRoomCore::getBannedCore(const Plat_Unicode::String &name, co
|
||||
|
||||
set<ChatAvatarCore *>::iterator iterCore = m_banAvatarsCore.begin();
|
||||
|
||||
for(; iterCore != m_banAvatarsCore.end(); iterCore++)
|
||||
for(; iterCore != m_banAvatarsCore.end(); ++iterCore)
|
||||
{
|
||||
ChatAvatarCore *avatarCore = (*iterCore);
|
||||
if (caseInsensitiveCompare(name, avatarCore->getName()) &&
|
||||
@@ -290,7 +290,7 @@ ChatAvatar *ChatRoomCore::getBanned(const Plat_Unicode::String &name, const Plat
|
||||
|
||||
set<ChatAvatar *>::iterator iter = m_banAvatars.begin();
|
||||
|
||||
for(; iter != m_banAvatars.end(); iter++)
|
||||
for(; iter != m_banAvatars.end(); ++iter)
|
||||
{
|
||||
ChatAvatar *avatar = (*iter);
|
||||
Plat_Unicode::String avatarName(avatar->getName().string_data, avatar->getName().string_length);
|
||||
@@ -315,7 +315,7 @@ ChatAvatarCore *ChatRoomCore::getInvitedCore(const Plat_Unicode::String &name, c
|
||||
|
||||
set<ChatAvatarCore *>::iterator iterCore = m_inviteAvatarsCore.begin();
|
||||
|
||||
for(; iterCore != m_inviteAvatarsCore.end(); iterCore++)
|
||||
for(; iterCore != m_inviteAvatarsCore.end(); ++iterCore)
|
||||
{
|
||||
ChatAvatarCore *avatarCore = (*iterCore);
|
||||
if (caseInsensitiveCompare(name, avatarCore->getName()) &&
|
||||
@@ -338,7 +338,7 @@ ChatAvatar *ChatRoomCore::getInvited(const Plat_Unicode::String &name, const Pla
|
||||
|
||||
set<ChatAvatar *>::iterator iter = m_inviteAvatars.begin();
|
||||
|
||||
for(; iter != m_inviteAvatars.end(); iter++)
|
||||
for(; iter != m_inviteAvatars.end(); ++iter)
|
||||
{
|
||||
ChatAvatar *avatar = (*iter);
|
||||
Plat_Unicode::String avatarName(avatar->getName().string_data, avatar->getName().string_length);
|
||||
@@ -450,7 +450,7 @@ ChatAvatarCore *ChatRoomCore::removeBan(const Plat_Unicode::String &name, const
|
||||
|
||||
set<ChatAvatarCore *>::iterator iterCore = m_banAvatarsCore.begin();
|
||||
|
||||
for(; iterCore != m_banAvatarsCore.end(); iterCore++)
|
||||
for(; iterCore != m_banAvatarsCore.end(); ++iterCore)
|
||||
{
|
||||
ChatAvatarCore *avatarCore = (*iterCore);
|
||||
if (caseInsensitiveCompare(name, avatarCore->getName()) &&
|
||||
@@ -469,7 +469,7 @@ ChatAvatarCore *ChatRoomCore::removeBan(const Plat_Unicode::String &name, const
|
||||
// because the addBan() made the ChatAvatar, removeBan() deletes it.
|
||||
set<ChatAvatar *>::iterator iter = m_banAvatars.begin();
|
||||
|
||||
for(; iter != m_banAvatars.end(); iter++)
|
||||
for(; iter != m_banAvatars.end(); ++iter)
|
||||
{
|
||||
ChatAvatar *avatar = (*iter);
|
||||
Plat_Unicode::String avatarName(avatar->getName().string_data, avatar->getName().string_length);
|
||||
@@ -569,7 +569,7 @@ ChatAvatarCore *ChatRoomCore::removeModerator(const Plat_Unicode::String &name,
|
||||
|
||||
set<ChatAvatarCore *>::iterator iterCore = m_moderatorAvatarsCore.begin();
|
||||
|
||||
for(; iterCore != m_moderatorAvatarsCore.end(); iterCore++)
|
||||
for(; iterCore != m_moderatorAvatarsCore.end(); ++iterCore)
|
||||
{
|
||||
ChatAvatarCore *avatarCore = (*iterCore);
|
||||
if (caseInsensitiveCompare(name, avatarCore->getName()) &&
|
||||
@@ -588,7 +588,7 @@ ChatAvatarCore *ChatRoomCore::removeModerator(const Plat_Unicode::String &name,
|
||||
// because the addBan() made the ChatAvatar, removeBan() deletes it.
|
||||
set<ChatAvatar *>::iterator iter = m_moderatorAvatars.begin();
|
||||
|
||||
for(; iter != m_moderatorAvatars.end(); iter++)
|
||||
for(; iter != m_moderatorAvatars.end(); ++iter)
|
||||
{
|
||||
ChatAvatar *avatar = (*iter);
|
||||
Plat_Unicode::String avatarName(avatar->getName().string_data, avatar->getName().string_length);
|
||||
@@ -641,7 +641,7 @@ ChatAvatarCore *ChatRoomCore::removeTempModerator(const Plat_Unicode::String &na
|
||||
|
||||
set<ChatAvatarCore *>::iterator iterCore = m_tempModeratorAvatarsCore.begin();
|
||||
|
||||
for(; iterCore != m_tempModeratorAvatarsCore.end(); iterCore++)
|
||||
for(; iterCore != m_tempModeratorAvatarsCore.end(); ++iterCore)
|
||||
{
|
||||
ChatAvatarCore *avatarCore = (*iterCore);
|
||||
if (caseInsensitiveCompare(name, avatarCore->getName()) &&
|
||||
@@ -660,7 +660,7 @@ ChatAvatarCore *ChatRoomCore::removeTempModerator(const Plat_Unicode::String &na
|
||||
// because the addBan() made the ChatAvatar, removeBan() deletes it.
|
||||
set<ChatAvatar *>::iterator iter = m_tempModeratorAvatars.begin();
|
||||
|
||||
for(; iter != m_tempModeratorAvatars.end(); iter++)
|
||||
for(; iter != m_tempModeratorAvatars.end(); ++iter)
|
||||
{
|
||||
ChatAvatar *avatar = (*iter);
|
||||
Plat_Unicode::String avatarName(avatar->getName().string_data, avatar->getName().string_length);
|
||||
@@ -713,7 +713,7 @@ ChatAvatarCore *ChatRoomCore::removeInvite(const Plat_Unicode::String &name, con
|
||||
|
||||
set<ChatAvatarCore *>::iterator iterCore = m_inviteAvatarsCore.begin();
|
||||
|
||||
for(; iterCore != m_inviteAvatarsCore.end(); iterCore++)
|
||||
for(; iterCore != m_inviteAvatarsCore.end(); ++iterCore)
|
||||
{
|
||||
ChatAvatarCore *avatarCore = (*iterCore);
|
||||
if (caseInsensitiveCompare(name, avatarCore->getName()) &&
|
||||
@@ -732,7 +732,7 @@ ChatAvatarCore *ChatRoomCore::removeInvite(const Plat_Unicode::String &name, con
|
||||
// because the addBan() made the ChatAvatar, removeBan() deletes it.
|
||||
set<ChatAvatar *>::iterator iter = m_inviteAvatars.begin();
|
||||
|
||||
for(; iter != m_inviteAvatars.end(); iter++)
|
||||
for(; iter != m_inviteAvatars.end(); ++iter)
|
||||
{
|
||||
ChatAvatar *avatar = (*iter);
|
||||
Plat_Unicode::String avatarName(avatar->getName().string_data, avatar->getName().string_length);
|
||||
@@ -785,7 +785,7 @@ ChatAvatarCore *ChatRoomCore::removeVoice(const Plat_Unicode::String &name, cons
|
||||
|
||||
set<ChatAvatarCore *>::iterator iterCore = m_voiceAvatarsCore.begin();
|
||||
|
||||
for(; iterCore != m_voiceAvatarsCore.end(); iterCore++)
|
||||
for(; iterCore != m_voiceAvatarsCore.end(); ++iterCore)
|
||||
{
|
||||
ChatAvatarCore *avatarCore = (*iterCore);
|
||||
if (caseInsensitiveCompare(name, avatarCore->getName()) &&
|
||||
@@ -804,7 +804,7 @@ ChatAvatarCore *ChatRoomCore::removeVoice(const Plat_Unicode::String &name, cons
|
||||
// because the addBan() made the ChatAvatar, removeBan() deletes it.
|
||||
set<ChatAvatar *>::iterator iter = m_voiceAvatars.begin();
|
||||
|
||||
for(; iter != m_voiceAvatars.end(); iter++)
|
||||
for(; iter != m_voiceAvatars.end(); ++iter)
|
||||
{
|
||||
ChatAvatar *avatar = (*iter);
|
||||
Plat_Unicode::String avatarName(avatar->getName().string_data, avatar->getName().string_length);
|
||||
@@ -874,7 +874,7 @@ AvatarIteratorCore ChatRoomCore::findAvatar(const String &name, const String &ad
|
||||
{
|
||||
map<unsigned, ChatAvatar *>::iterator iter;
|
||||
|
||||
for (iter = m_inroomAvatars.begin(); iter != m_inroomAvatars.end(); iter++)
|
||||
for (iter = m_inroomAvatars.begin(); iter != m_inroomAvatars.end(); ++iter)
|
||||
{
|
||||
if(String((*iter).second->getName().string_data, (*iter).second->getName().string_length) == name &&
|
||||
String((*iter).second->getAddress().string_data, (*iter).second->getAddress().string_length) == address)
|
||||
@@ -895,7 +895,7 @@ ModeratorIteratorCore ChatRoomCore::findModerator(const String &name, const Stri
|
||||
{
|
||||
set<ChatAvatar *>::iterator iter;
|
||||
|
||||
for (iter = m_moderatorAvatars.begin(); iter != m_moderatorAvatars.end(); iter++)
|
||||
for (iter = m_moderatorAvatars.begin(); iter != m_moderatorAvatars.end(); ++iter)
|
||||
{
|
||||
ChatAvatar *avatar = (*iter);
|
||||
Plat_Unicode::String avatarName(avatar->getName().string_data, avatar->getName().string_length);
|
||||
@@ -919,7 +919,7 @@ TemporaryModeratorIteratorCore ChatRoomCore::findTemporaryModerator(const String
|
||||
{
|
||||
set<ChatAvatar *>::iterator iter;
|
||||
|
||||
for (iter = m_tempModeratorAvatars.begin(); iter != m_tempModeratorAvatars.end(); iter++)
|
||||
for (iter = m_tempModeratorAvatars.begin(); iter != m_tempModeratorAvatars.end(); ++iter)
|
||||
{
|
||||
ChatAvatar *avatar = (*iter);
|
||||
Plat_Unicode::String avatarName(avatar->getName().string_data, avatar->getName().string_length);
|
||||
@@ -943,7 +943,7 @@ BanIteratorCore ChatRoomCore::findBanned(const String &name, const String &addre
|
||||
{
|
||||
set<ChatAvatar *>::iterator iter;
|
||||
|
||||
for (iter = m_banAvatars.begin(); iter != m_banAvatars.end(); iter++)
|
||||
for (iter = m_banAvatars.begin(); iter != m_banAvatars.end(); ++iter)
|
||||
{
|
||||
ChatAvatar *avatar = (*iter);
|
||||
Plat_Unicode::String avatarName(avatar->getName().string_data, avatar->getName().string_length);
|
||||
@@ -967,7 +967,7 @@ InviteIteratorCore ChatRoomCore::findInvited(const String &name, const String &a
|
||||
{
|
||||
set<ChatAvatar *>::iterator iter;
|
||||
|
||||
for (iter = m_inviteAvatars.begin(); iter != m_inviteAvatars.end(); iter++)
|
||||
for (iter = m_inviteAvatars.begin(); iter != m_inviteAvatars.end(); ++iter)
|
||||
{
|
||||
ChatAvatar *avatar = (*iter);
|
||||
Plat_Unicode::String avatarName(avatar->getName().string_data, avatar->getName().string_length);
|
||||
@@ -991,7 +991,7 @@ VoiceIteratorCore ChatRoomCore::findVoice(const String &name, const String &addr
|
||||
{
|
||||
set<ChatAvatar *>::iterator iter;
|
||||
|
||||
for (iter = m_voiceAvatars.begin(); iter != m_voiceAvatars.end(); iter++)
|
||||
for (iter = m_voiceAvatars.begin(); iter != m_voiceAvatars.end(); ++iter)
|
||||
{
|
||||
ChatAvatar *avatar = (*iter);
|
||||
Plat_Unicode::String avatarName(avatar->getName().string_data, avatar->getName().string_length);
|
||||
@@ -1050,7 +1050,7 @@ void ChatRoomCore::serializeWithLocalAvatarsOnly(Base::ByteStream &msg)
|
||||
std::map<unsigned, ChatAvatarCore *>::iterator avatarIter;
|
||||
std::set<ChatAvatarCore *> avatarsToSend;
|
||||
|
||||
for (avatarIter = m_inroomAvatarsCore.begin(); avatarIter != m_inroomAvatarsCore.end(); avatarIter++)
|
||||
for (avatarIter = m_inroomAvatarsCore.begin(); avatarIter != m_inroomAvatarsCore.end(); ++avatarIter)
|
||||
{
|
||||
// include only the avatars that are on this API
|
||||
if ( this->getAvatar((*avatarIter).second->getAvatarID()) != NULL )
|
||||
@@ -1064,7 +1064,7 @@ void ChatRoomCore::serializeWithLocalAvatarsOnly(Base::ByteStream &msg)
|
||||
put(msg, avatarCount);
|
||||
|
||||
std::set<ChatAvatarCore *>::iterator sendIter;
|
||||
for (sendIter = avatarsToSend.begin(); sendIter != avatarsToSend.end(); sendIter++)
|
||||
for (sendIter = avatarsToSend.begin(); sendIter != avatarsToSend.end(); ++sendIter)
|
||||
{
|
||||
(*sendIter)->serialize(msg);
|
||||
}
|
||||
@@ -1074,7 +1074,7 @@ void ChatRoomCore::serializeWithLocalAvatarsOnly(Base::ByteStream &msg)
|
||||
put(msg, administratorCount);
|
||||
|
||||
std::map<unsigned, ChatAvatarCore *>::iterator adminIter;
|
||||
for (adminIter = m_adminAvatarsCore.begin(); adminIter != m_adminAvatarsCore.end(); adminIter++)
|
||||
for (adminIter = m_adminAvatarsCore.begin(); adminIter != m_adminAvatarsCore.end(); ++adminIter)
|
||||
{
|
||||
(*adminIter).second->serialize(msg);
|
||||
}
|
||||
@@ -1084,7 +1084,7 @@ void ChatRoomCore::serializeWithLocalAvatarsOnly(Base::ByteStream &msg)
|
||||
put(msg, moderatorCount);
|
||||
|
||||
std::set<ChatAvatarCore *>::iterator moderatorIter;
|
||||
for (moderatorIter = m_moderatorAvatarsCore.begin(); moderatorIter != m_moderatorAvatarsCore.end(); moderatorIter++)
|
||||
for (moderatorIter = m_moderatorAvatarsCore.begin(); moderatorIter != m_moderatorAvatarsCore.end(); ++moderatorIter)
|
||||
{
|
||||
(*moderatorIter)->serialize(msg);
|
||||
}
|
||||
@@ -1094,7 +1094,7 @@ void ChatRoomCore::serializeWithLocalAvatarsOnly(Base::ByteStream &msg)
|
||||
put(msg, tempModeratorCount);
|
||||
|
||||
std::set<ChatAvatarCore *>::iterator tempModeratorIter;
|
||||
for (tempModeratorIter = m_tempModeratorAvatarsCore.begin(); tempModeratorIter != m_tempModeratorAvatarsCore.end(); tempModeratorIter++)
|
||||
for (tempModeratorIter = m_tempModeratorAvatarsCore.begin(); tempModeratorIter != m_tempModeratorAvatarsCore.end(); ++tempModeratorIter)
|
||||
{
|
||||
(*tempModeratorIter)->serialize(msg);
|
||||
}
|
||||
@@ -1104,7 +1104,7 @@ void ChatRoomCore::serializeWithLocalAvatarsOnly(Base::ByteStream &msg)
|
||||
put(msg, bannedCount);
|
||||
|
||||
std::set<ChatAvatarCore *>::iterator bannedIter;
|
||||
for (bannedIter = m_banAvatarsCore.begin(); bannedIter != m_banAvatarsCore.end(); bannedIter++)
|
||||
for (bannedIter = m_banAvatarsCore.begin(); bannedIter != m_banAvatarsCore.end(); ++bannedIter)
|
||||
{
|
||||
(*bannedIter)->serialize(msg);
|
||||
}
|
||||
@@ -1114,7 +1114,7 @@ void ChatRoomCore::serializeWithLocalAvatarsOnly(Base::ByteStream &msg)
|
||||
put(msg, invitedCount);
|
||||
|
||||
std::set<ChatAvatarCore *>::iterator invitesIter;
|
||||
for (invitesIter = m_inviteAvatarsCore.begin(); invitesIter != m_inviteAvatarsCore.end(); invitesIter++)
|
||||
for (invitesIter = m_inviteAvatarsCore.begin(); invitesIter != m_inviteAvatarsCore.end(); ++invitesIter)
|
||||
{
|
||||
(*invitesIter)->serialize(msg);
|
||||
}
|
||||
@@ -1124,7 +1124,7 @@ void ChatRoomCore::serializeWithLocalAvatarsOnly(Base::ByteStream &msg)
|
||||
put(msg, voiceCount);
|
||||
|
||||
std::set<ChatAvatarCore *>::iterator voicesIter;
|
||||
for (voicesIter = m_voiceAvatarsCore.begin(); voicesIter != m_voiceAvatarsCore.end(); voicesIter++)
|
||||
for (voicesIter = m_voiceAvatarsCore.begin(); voicesIter != m_voiceAvatarsCore.end(); ++voicesIter)
|
||||
{
|
||||
(*voicesIter)->serialize(msg);
|
||||
}
|
||||
|
||||
@@ -82,7 +82,7 @@ int CCmdLine::SplitLine(int argc, char **argv)
|
||||
}
|
||||
else
|
||||
{
|
||||
arg = "";
|
||||
arg.clear();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -90,7 +90,7 @@ int CCmdLine::SplitLine(int argc, char **argv)
|
||||
CCmdParam cmd;
|
||||
|
||||
// only add non-empty args
|
||||
if (arg != "")
|
||||
if (arg.empty())
|
||||
{
|
||||
cmd.m_strings.push_back(arg);
|
||||
}
|
||||
|
||||
@@ -174,7 +174,7 @@ void Logger::LoggerInit(const char *programName)
|
||||
Logger::~Logger()
|
||||
{
|
||||
map<unsigned, LogInfo *>::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);
|
||||
@@ -219,7 +219,7 @@ void Logger::setLoggingType(unsigned logLevel, ELogType logType)
|
||||
|
||||
for (levelIter = m_logLevelToTypeMap.begin();
|
||||
levelIter != m_logLevelToTypeMap.end();
|
||||
levelIter++)
|
||||
++levelIter)
|
||||
{
|
||||
m_combinedLogType = (ELogType)(m_combinedLogType | logType);
|
||||
}
|
||||
@@ -245,7 +245,7 @@ void Logger::flushAll()
|
||||
{
|
||||
map<unsigned, LogInfo *>::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);
|
||||
@@ -634,7 +634,7 @@ void Logger::rollDate(time_t t)
|
||||
m_logPrefix = buf;
|
||||
|
||||
map<unsigned, LogInfo *>::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);
|
||||
|
||||
@@ -52,7 +52,7 @@ namespace Base
|
||||
Update(input);
|
||||
}
|
||||
|
||||
vector<int> MD5::Decode(vector<char> achar0, int i, int j)
|
||||
vector<int> MD5::Decode(const vector<char> &achar0, int i, int j)
|
||||
{
|
||||
vector<int> ai(16,0);
|
||||
int l;
|
||||
@@ -66,7 +66,7 @@ namespace Base
|
||||
return ai;
|
||||
}
|
||||
|
||||
vector<char> MD5::Encode(vector<int> ai, int i)
|
||||
vector<char> MD5::Encode(vector<int> &ai, int i)
|
||||
{
|
||||
vector<char> achar0(i,0);
|
||||
int k;
|
||||
@@ -250,7 +250,7 @@ namespace Base
|
||||
}
|
||||
}
|
||||
|
||||
void MD5::Update(string s)
|
||||
void MD5::Update(const string &s)
|
||||
{
|
||||
vector<char> 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<char> achar0)
|
||||
void MD5::Update(const vector<char> &achar0)
|
||||
{
|
||||
Update(achar0, 0, achar0.size());
|
||||
}
|
||||
|
||||
void MD5::Update(vector<char> achar0, int i)
|
||||
void MD5::Update(const vector<char> &achar0, int i)
|
||||
{
|
||||
Update(state, achar0, 0, i);
|
||||
}
|
||||
|
||||
void MD5::Update(vector<char> achar0, int i, int j)
|
||||
void MD5::Update(const vector<char> &achar0, int i, int j)
|
||||
{
|
||||
Update(state, achar0, i, j);
|
||||
}
|
||||
@@ -278,7 +278,7 @@ namespace Base
|
||||
return asHex(Final());
|
||||
}
|
||||
|
||||
string MD5::asHex(vector<char> achar0)
|
||||
string MD5::asHex(const vector<char> &achar0)
|
||||
{
|
||||
const string hex = "0123456789abcdef";
|
||||
|
||||
|
||||
@@ -36,22 +36,22 @@ namespace Base
|
||||
void Init();
|
||||
std::vector<char> Final();
|
||||
void Update(char char0);
|
||||
void Update(State & state1, std::vector<char> achar0, int i, int j);
|
||||
void Update(std::string s);
|
||||
void Update(std::vector<char> achar0);
|
||||
void Update(std::vector<char> achar0, int i);
|
||||
void Update(std::vector<char> achar0, int i, int j);
|
||||
void Update(State & state1, const std::vector<char> &achar0, int i, int j);
|
||||
void Update(const std::string &s);
|
||||
void Update(const std::vector<char> &achar0);
|
||||
void Update(const std::vector<char> &achar0, int i);
|
||||
void Update(const std::vector<char> &achar0, int i, int j);
|
||||
std::string asHex();
|
||||
static std::string asHex(std::vector<char> achar0);
|
||||
static std::string asHex(const std::vector<char> &achar0);
|
||||
|
||||
private:
|
||||
std::vector<int> Decode(std::vector<char> achar0, int i, int j);
|
||||
std::vector<char> Encode(std::vector<int> ai, int i);
|
||||
std::vector<int> Decode(const std::vector<char> &achar0, int i, int j);
|
||||
std::vector<char> Encode(std::vector<int> &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<char> achar0, int i);
|
||||
void Transform(State & state1, const std::vector<char> &achar0, int i);
|
||||
int rotate_left(int i, int j);
|
||||
int uadd(int i, int j);
|
||||
int uadd(int i, int j, int k);
|
||||
|
||||
+2
-2
@@ -69,7 +69,7 @@ GenericAPICore::GenericAPICore(const char *hosts[],
|
||||
|
||||
GenericAPICore::~GenericAPICore()
|
||||
{
|
||||
for (std::vector<GenericConnection *>::iterator conIter = m_serverConnections.begin(); conIter != m_serverConnections.end(); conIter++)
|
||||
for (std::vector<GenericConnection *>::iterator conIter = m_serverConnections.begin(); conIter != m_serverConnections.end(); ++conIter)
|
||||
{
|
||||
GenericConnection *con = *conIter;
|
||||
delete con;
|
||||
@@ -209,7 +209,7 @@ void GenericAPICore::process()
|
||||
}
|
||||
}
|
||||
|
||||
for (std::vector<GenericConnection *>::iterator conIter = m_serverConnections.begin(); conIter != m_serverConnections.end(); conIter++)
|
||||
for (std::vector<GenericConnection *>::iterator conIter = m_serverConnections.begin(); conIter != m_serverConnections.end(); ++conIter)
|
||||
{
|
||||
GenericConnection *con = *conIter;
|
||||
con->process();
|
||||
|
||||
Reference in New Issue
Block a user