Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-06-06 21:58:57 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

changed post fixed operator++ into prefixed. More efficient on some systems. Patch from Phenom.

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7630 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2014-10-24 22:07:26 +00:00
parent 880efee332
commit d547cb6fdb
82 changed files with 717 additions and 718 deletions
Download patch file Download diff file Expand all files Collapse all files

6
libretroshare/src/gxs/gxstokenqueue.cc
View file

@ -69,7 +69,7 @@ void GxsTokenQueue::checkRequests()
std::cerr << "GxsTokenQueue::checkRequests() token: " << token << " Complete";
std::cerr << std::endl;
#endif
it++;
++it;
}
else if (status == RsTokenService::GXS_REQUEST_V2_STATUS_FAILED)
{
@ -85,14 +85,14 @@ void GxsTokenQueue::checkRequests()
std::cerr << "GxsTokenQueue::checkRequests() token: " << token << " is unfinished, status: " << status;
std::cerr << std::endl;
#endif
it++;
++it;
}
}
}
if (stuffToLoad)
{
for(it = toload.begin(); it != toload.end(); it++)
for(it = toload.begin(); it != toload.end(); ++it)
{
handleResponse(it->mToken, it->mReqType);
}

58
libretroshare/src/gxs/rsdataservice.cc
View file

@ -565,7 +565,7 @@ int RsDataService::storeMessage(std::map<RsNxsMsg *, RsGxsMsgMetaData *> &msg)
// start a transaction
mDb->execSQL("BEGIN;");
for(; mit != msg.end(); mit++){
for(; mit != msg.end(); ++mit){
RsNxsMsg* msgPtr = mit->first;
RsGxsMsgMetaData* msgMetaPtr = mit->second;
@ -649,7 +649,7 @@ int RsDataService::storeMessage(std::map<RsNxsMsg *, RsGxsMsgMetaData *> &msg)
// finish transaction
bool ret = mDb->execSQL("COMMIT;");
for(mit = msg.begin(); mit != msg.end(); mit++)
for(mit = msg.begin(); mit != msg.end(); ++mit)
{
//TODO: API encourages aliasing, remove this abomination
if(mit->second != mit->first->metaData)
@ -680,7 +680,7 @@ int RsDataService::storeGroup(std::map<RsNxsGrp *, RsGxsGrpMetaData *> &grp)
// begin transaction
mDb->execSQL("BEGIN;");
for(; sit != grp.end(); sit++)
for(; sit != grp.end(); ++sit)
{
RsNxsGrp* grpPtr = sit->first;
@ -764,7 +764,7 @@ int RsDataService::storeGroup(std::map<RsNxsGrp *, RsGxsGrpMetaData *> &grp)
// finish transaction
bool ret = mDb->execSQL("COMMIT;");
for(sit = grp.begin(); sit != grp.end(); sit++)
for(sit = grp.begin(); sit != grp.end(); ++sit)
{
//TODO: API encourages aliasing, remove this abomination
if(sit->second != sit->first->metaData)
@ -786,7 +786,7 @@ int RsDataService::updateGroup(std::map<RsNxsGrp *, RsGxsGrpMetaData *> &grp)
// begin transaction
mDb->execSQL("BEGIN;");
for(; sit != grp.end(); sit++)
for(; sit != grp.end(); ++sit)
{
RsNxsGrp* grpPtr = sit->first;
@ -853,7 +853,7 @@ int RsDataService::updateGroup(std::map<RsNxsGrp *, RsGxsGrpMetaData *> &grp)
// finish transaction
bool ret = mDb->execSQL("COMMIT;");
for(sit = grp.begin(); sit != grp.end(); sit++)
for(sit = grp.begin(); sit != grp.end(); ++sit)
{
//TODO: API encourages aliasing, remove this abomination
if(sit->second != sit->first->metaData)
@ -911,7 +911,7 @@ int RsDataService::retrieveNxsGrps(std::map<RsGxsGroupId, RsNxsGrp *> &grp, bool
locked_retrieveGroups(c, grps);
std::vector<RsNxsGrp*>::iterator vit = grps.begin();
for(; vit != grps.end(); vit++)
for(; vit != grps.end(); ++vit)
{
grp[(*vit)->grpId] = *vit;
}
@ -926,7 +926,7 @@ int RsDataService::retrieveNxsGrps(std::map<RsGxsGroupId, RsNxsGrp *> &grp, bool
std::list<RsGxsGroupId> toRemove;
for(; mit != grp.end(); mit++)
for(; mit != grp.end(); ++mit)
{
const RsGxsGroupId& grpId = mit->first;
RetroCursor* c = mDb->sqlQuery(GRP_TABLE_NAME, grpColumns, "grpId='" + grpId.toStdString() + "'", "");
@ -959,13 +959,13 @@ int RsDataService::retrieveNxsGrps(std::map<RsGxsGroupId, RsNxsGrp *> &grp, bool
{
std::map<RsGxsGroupId, RsGxsGrpMetaData*> metaMap;
std::map<RsGxsGroupId, RsNxsGrp *>::iterator mit = grp.begin();
for(; mit != grp.end(); mit++)
for(; mit != grp.end(); ++mit)
metaMap.insert(std::make_pair(mit->first, (RsGxsGrpMetaData*)(NULL)));
retrieveGxsGrpMetaData(metaMap);
mit = grp.begin();
for(; mit != grp.end(); mit++)
for(; mit != grp.end(); ++mit)
{
RsNxsGrp* grpPtr = grp[mit->first];
grpPtr->metaData = metaMap[mit->first];
@ -1007,7 +1007,7 @@ int RsDataService::retrieveNxsMsgs(const GxsMsgReq &reqIds, GxsMsgResult &msg, b
GxsMsgReq metaReqIds;// collects metaReqIds if needed
for(; mit != reqIds.end(); mit++)
for(; mit != reqIds.end(); ++mit)
{
const RsGxsGroupId& grpId = mit->first;
@ -1031,7 +1031,7 @@ int RsDataService::retrieveNxsMsgs(const GxsMsgReq &reqIds, GxsMsgResult &msg, b
// request each grp
std::vector<RsGxsMessageId>::const_iterator sit = msgIdV.begin();
for(; sit!=msgIdV.end();sit++){
for(; sit!=msgIdV.end();++sit){
const RsGxsMessageId& msgId = *sit;
RsStackMutex stack(mDbMutex);
@ -1055,7 +1055,7 @@ int RsDataService::retrieveNxsMsgs(const GxsMsgReq &reqIds, GxsMsgResult &msg, b
std::vector<RsNxsMsg*>::iterator lit = msgSet.begin(),
lit_end = msgSet.end();
for(; lit != lit_end; lit++)
for(; lit != lit_end; ++lit)
msgIds.push_back( (*lit)->msgId );
metaReqIds[grpId] = msgIds;
@ -1075,7 +1075,7 @@ int RsDataService::retrieveNxsMsgs(const GxsMsgReq &reqIds, GxsMsgResult &msg, b
GxsMsgResult::iterator mit2 = msg.begin(), mit2_end = msg.end();
for(; mit2 != mit2_end; mit2++)
for(; mit2 != mit2_end; ++mit2)
{
const RsGxsGroupId& grpId = mit2->first;
std::vector<RsNxsMsg*>& msgV = msg[grpId];
@ -1084,7 +1084,7 @@ int RsDataService::retrieveNxsMsgs(const GxsMsgReq &reqIds, GxsMsgResult &msg, b
// as retrieval only attempts to retrieve what was found this elimiates chance
// of a memory fault as all are assigned
for(; lit != lit_end; lit++)
for(; lit != lit_end; ++lit)
{
std::vector<RsGxsMsgMetaData*>& msgMetaV = metaResult[grpId];
std::vector<RsGxsMsgMetaData*>::iterator meta_lit = msgMetaV.begin();
@ -1097,7 +1097,7 @@ int RsDataService::retrieveNxsMsgs(const GxsMsgReq &reqIds, GxsMsgResult &msg, b
msgPtr->metaData = meta;
meta_lit = msgMetaV.erase(meta_lit);
}else{
meta_lit++;
++meta_lit;
}
}
}
@ -1141,7 +1141,7 @@ int RsDataService::retrieveGxsMsgMetaData(const GxsMsgReq& reqIds, GxsMsgMetaRes
GxsMsgReq::const_iterator mit = reqIds.begin();
for(; mit != reqIds.end(); mit++)
for(; mit != reqIds.end(); ++mit)
{
const RsGxsGroupId& grpId = mit->first;
@ -1160,7 +1160,7 @@ int RsDataService::retrieveGxsMsgMetaData(const GxsMsgReq& reqIds, GxsMsgMetaRes
// request each grp
std::vector<RsGxsMessageId>::const_iterator sit = msgIdV.begin();
for(; sit!=msgIdV.end();sit++){
for(; sit!=msgIdV.end(); ++sit){
const RsGxsMessageId& msgId = *sit;
RetroCursor* c = mDb->sqlQuery(MSG_TABLE_NAME, msgMetaColumns, KEY_GRP_ID+ "='" + grpId.toStdString()
+ "' AND " + KEY_MSG_ID + "='" + msgId.toStdString() + "'", "");
@ -1231,7 +1231,7 @@ int RsDataService::retrieveGxsGrpMetaData(std::map<RsGxsGroupId, RsGxsGrpMetaDat
{
std::map<RsGxsGroupId, RsGxsGrpMetaData *>::iterator mit = grp.begin();
for(; mit != grp.end(); mit++)
for(; mit != grp.end(); ++mit)
{
const RsGxsGroupId& grpId = mit->first;
RetroCursor* c = mDb->sqlQuery(GRP_TABLE_NAME, grpMetaColumns, "grpId='" + grpId.toStdString() + "'", "");
@ -1278,7 +1278,7 @@ int RsDataService::resetDataStore()
RsStackMutex stack(mDbMutex);
// remove all grp msgs files from service dir
for(; mit != grps.end(); mit++){
for(; mit != grps.end(); ++mit){
std::string file = mServiceDir + "/" + mit->first.toStdString();
std::string msgFile = file + "-msgs";
remove(file.c_str()); // remove group file
@ -1337,7 +1337,7 @@ int RsDataService::removeMsgs(const GxsMsgReq& msgIds)
GxsMsgReq::const_iterator mit = msgIds.begin();
for(; mit != msgIds.end(); mit++)
for(; mit != msgIds.end(); ++mit)
{
MsgUpdates updates;
const std::vector<RsGxsMessageId>& msgIdV = mit->second;
@ -1358,7 +1358,7 @@ int RsDataService::removeMsgs(const GxsMsgReq& msgIds)
std::vector<MsgOffset>::iterator vit = msgOffsets.begin();
uint32_t maxSize = 0;// größe aller msgs, newbuf könnte aber kleiner sein, weil msgs weggehen
for(; vit != msgOffsets.end(); vit++)
for(; vit != msgOffsets.end(); ++vit)
maxSize += vit->msgLen;
// may be preferable to determine file len reality
@ -1372,7 +1372,7 @@ int RsDataService::removeMsgs(const GxsMsgReq& msgIds)
in.close();
uint32_t newOffset = 0;// am anfang der liste ist offset=0, jetzt gehen wir die msgs liste durch
for(std::vector<MsgOffset>::size_type i = 0; i < msgOffsets.size(); i++)
for(std::vector<MsgOffset>::size_type i = 0; i < msgOffsets.size(); ++i)
{
const MsgOffset& m = msgOffsets[i];
@ -1431,7 +1431,7 @@ int RsDataService::removeGroups(const std::vector<RsGxsGroupId> &grpIds)
// from db
std::vector<RsGxsGroupId>::const_iterator vit = grpIds.begin();
for(; vit != grpIds.end(); vit++)
for(; vit != grpIds.end(); ++vit)
{
const std::string grpFileName = mServiceDir + "/" + (*vit).toStdString();
remove(grpFileName.c_str());
@ -1505,14 +1505,14 @@ bool RsDataService::locked_updateMessageEntries(const MsgUpdates& updates)
MsgUpdates::const_iterator mit = updates.begin();
for(; mit != updates.end(); mit++)
for(; mit != updates.end(); ++mit)
{
const RsGxsGroupId& grpId = mit->first;
const std::vector<MsgUpdate>& updateV = mit->second;
std::vector<MsgUpdate>::const_iterator vit = updateV.begin();
for(; vit != updateV.end(); vit++)
for(; vit != updateV.end(); ++vit)
{
const MsgUpdate& update = *vit;
mDb->sqlUpdate(MSG_TABLE_NAME, KEY_GRP_ID+ "='" + grpId.toStdString()
@ -1532,13 +1532,13 @@ bool RsDataService::locked_removeMessageEntries(const GxsMsgReq& msgIds)
GxsMsgReq::const_iterator mit = msgIds.begin();
for(; mit != msgIds.end(); mit++)
for(; mit != msgIds.end(); ++mit)
{
const RsGxsGroupId& grpId = mit->first;
const std::vector<RsGxsMessageId>& msgsV = mit->second;
std::vector<RsGxsMessageId>::const_iterator vit = msgsV.begin();
for(; vit != msgsV.end(); vit++)
for(; vit != msgsV.end(); ++vit)
{
const RsGxsMessageId& msgId = *vit;
mDb->sqlDelete(MSG_TABLE_NAME, KEY_GRP_ID+ "='" + grpId.toStdString()
@ -1558,7 +1558,7 @@ bool RsDataService::locked_removeGroupEntries(const std::vector<RsGxsGroupId>& g
std::vector<RsGxsGroupId>::const_iterator vit = grpIds.begin();
for(; vit != grpIds.end(); vit++)
for(; vit != grpIds.end(); ++vit)
{
const RsGxsGroupId& grpId = *vit;

80
libretroshare/src/gxs/rsgenexchange.cc
View file

@ -378,7 +378,7 @@ uint8_t RsGenExchange::createGroup(RsNxsGrp *grp, RsTlvSecurityKeySet& privateKe
std::map<RsGxsId, RsTlvSecurityKey>::iterator mit = privateKeySet.keys.begin();
bool privKeyFound = false; // private admin key
for(; mit != privateKeySet.keys.end(); mit++)
for(; mit != privateKeySet.keys.end(); ++mit)
{
RsTlvSecurityKey& key = mit->second;
@ -591,7 +591,7 @@ int RsGenExchange::createMsgSignatures(RsTlvKeySignatureSet& signSet, RsTlvBinar
std::map<RsGxsId, RsTlvSecurityKey>::iterator mit =
keys.keys.begin(), mit_end = keys.keys.end();
bool pub_key_found = false;
for(; mit != mit_end; mit++)
for(; mit != mit_end; ++mit)
{
pub_key_found = mit->second.keyFlags == (RSTLV_KEY_DISTRIB_PRIVATE | RSTLV_KEY_TYPE_FULL);
@ -802,7 +802,7 @@ int RsGenExchange::validateMsg(RsNxsMsg *msg, const uint32_t& grpFlag, RsTlvSecu
std::map<RsGxsId, RsTlvSecurityKey>::iterator mit = keys.begin();
RsGxsId keyId;
for(; mit != keys.end() ; mit++)
for(; mit != keys.end() ; ++mit)
{
RsTlvSecurityKey& key = mit->second;
@ -991,7 +991,7 @@ void RsGenExchange::receiveChanges(std::vector<RsGxsNotify*>& changes)
#endif
std::vector<RsGxsNotify*>::iterator vit = changes.begin();
for(; vit != changes.end(); vit++)
for(; vit != changes.end(); ++vit)
{
RsGxsNotify* n = *vit;
RsGxsGroupChange* gc;
@ -1045,7 +1045,7 @@ void RsGenExchange::groupsChanged(std::list<RsGxsGroupId>& grpIds, std::list<RsG
RsGxsGroupChange* gc = mGroupChange.back();
std::list<RsGxsGroupId>& gList = gc->mGrpIdList;
std::list<RsGxsGroupId>::iterator lit = gList.begin();
for(; lit != gList.end(); lit++)
for(; lit != gList.end(); ++lit)
if (gc->metaChange())
{
grpIdsMeta.push_back(*lit);
@ -1142,7 +1142,7 @@ bool RsGenExchange::getGroupMeta(const uint32_t &token, std::list<RsGroupMetaDat
std::list<RsGxsGrpMetaData*>::iterator lit = metaL.begin();
RsGroupMetaData m;
for(; lit != metaL.end(); lit++)
for(; lit != metaL.end(); ++lit)
{
RsGxsGrpMetaData& gMeta = *(*lit);
m = gMeta;
@ -1172,7 +1172,7 @@ bool RsGenExchange::getMsgMeta(const uint32_t &token,
GxsMsgMetaResult::iterator mit = result.begin();
for(; mit != result.end(); mit++)
for(; mit != result.end(); ++mit)
{
std::vector<RsGxsMsgMetaData*>& metaV = mit->second;
@ -1181,7 +1181,7 @@ bool RsGenExchange::getMsgMeta(const uint32_t &token,
std::vector<RsGxsMsgMetaData*>::iterator vit = metaV.begin();
RsMsgMetaData meta;
for(; vit != metaV.end(); vit++)
for(; vit != metaV.end(); ++vit)
{
RsGxsMsgMetaData& m = *(*vit);
meta = m;
@ -1201,7 +1201,7 @@ bool RsGenExchange::getMsgRelatedMeta(const uint32_t &token, GxsMsgRelatedMetaMa
MsgRelatedMetaResult::iterator mit = result.begin();
for(; mit != result.end(); mit++)
for(; mit != result.end(); ++mit)
{
std::vector<RsGxsMsgMetaData*>& metaV = mit->second;
@ -1210,7 +1210,7 @@ bool RsGenExchange::getMsgRelatedMeta(const uint32_t &token, GxsMsgRelatedMetaMa
std::vector<RsGxsMsgMetaData*>::iterator vit = metaV.begin();
RsMsgMetaData meta;
for(; vit != metaV.end(); vit++)
for(; vit != metaV.end(); ++vit)
{
RsGxsMsgMetaData& m = *(*vit);
meta = m;
@ -1236,7 +1236,7 @@ bool RsGenExchange::getGroupData(const uint32_t &token, std::vector<RsGxsGrpItem
if(ok)
{
for(; lit != nxsGrps.end(); lit++)
for(; lit != nxsGrps.end(); ++lit)
{
RsTlvBinaryData& data = (*lit)->grp;
RsItem* item = NULL;
@ -1284,13 +1284,13 @@ bool RsGenExchange::getMsgData(const uint32_t &token, GxsMsgDataMap &msgItems)
if(ok)
{
for(; mit != msgResult.end(); mit++)
for(; mit != msgResult.end(); ++mit)
{
std::vector<RsGxsMsgItem*> gxsMsgItems;
const RsGxsGroupId& grpId = mit->first;
std::vector<RsNxsMsg*>& nxsMsgsV = mit->second;
std::vector<RsNxsMsg*>::iterator vit = nxsMsgsV.begin();
for(; vit != nxsMsgsV.end(); vit++)
for(; vit != nxsMsgsV.end(); ++vit)
{
RsNxsMsg*& msg = *vit;
RsItem* item = NULL;
@ -1336,14 +1336,14 @@ bool RsGenExchange::getMsgRelatedData(const uint32_t &token, GxsMsgRelatedDataMa
if(ok)
{
NxsMsgRelatedDataResult::iterator mit = msgResult.begin();
for(; mit != msgResult.end(); mit++)
for(; mit != msgResult.end(); ++mit)
{
std::vector<RsGxsMsgItem*> gxsMsgItems;
const RsGxsGrpMsgIdPair& msgId = mit->first;
std::vector<RsNxsMsg*>& nxsMsgsV = mit->second;
std::vector<RsNxsMsg*>::iterator vit
= nxsMsgsV.begin();
for(; vit != nxsMsgsV.end(); vit++)
for(; vit != nxsMsgsV.end(); ++vit)
{
RsNxsMsg*& msg = *vit;
RsItem* item = NULL;
@ -1427,7 +1427,7 @@ void RsGenExchange::notifyNewGroups(std::vector<RsNxsGrp *> &groups)
std::vector<RsNxsGrp*>::iterator vit = groups.begin();
// store these for tick() to pick them up
for(; vit != groups.end(); vit++)
for(; vit != groups.end(); ++vit)
{
RsNxsGrp* grp = *vit;
NxsGrpPendValidVect::iterator received = std::find(mReceivedGrps.begin(),
@ -1461,7 +1461,7 @@ void RsGenExchange::notifyNewMessages(std::vector<RsNxsMsg *>& messages)
std::vector<RsNxsMsg*>::iterator vit = messages.begin();
// store these for tick() to pick them up
for(; vit != messages.end(); vit++)
for(; vit != messages.end(); ++vit)
{
RsNxsMsg* msg = *vit;
@ -1613,7 +1613,7 @@ void RsGenExchange::processMsgMetaChanges()
std::map<uint32_t, MsgLocMetaData>::iterator mit = mMsgLocMetaMap.begin(),
mit_end = mMsgLocMetaMap.end();
for(; mit != mit_end; mit++)
for(; mit != mit_end; ++mit)
{
MsgLocMetaData& m = mit->second;
@ -1689,7 +1689,7 @@ void RsGenExchange::processGrpMetaChanges()
std::map<uint32_t, GrpLocMetaData>::iterator mit = mGrpLocMetaMap.begin(),
mit_end = mGrpLocMetaMap.end();
for(; mit != mit_end; mit++)
for(; mit != mit_end; ++mit)
{
GrpLocMetaData& g = mit->second;
uint32_t token = mit->first;
@ -1782,7 +1782,7 @@ void RsGenExchange::publishMsgs()
PendSignMap::iterator sign_it = mMsgPendingSign.begin();
for(; sign_it != mMsgPendingSign.end(); sign_it++)
for(; sign_it != mMsgPendingSign.end(); ++sign_it)
{
GxsPendingItem<RsGxsMsgItem*, uint32_t>& item = sign_it->second;
mMsgsToPublish.insert(std::make_pair(sign_it->first, item.mItem));
@ -1791,7 +1791,7 @@ void RsGenExchange::publishMsgs()
std::map<RsGxsGroupId, std::vector<RsGxsMessageId> > msgChangeMap;
std::map<uint32_t, RsGxsMsgItem*>::iterator mit = mMsgsToPublish.begin();
for(; mit != mMsgsToPublish.end(); mit++)
for(; mit != mMsgsToPublish.end(); ++mit)
{
#ifdef GEN_EXCH_DEBUG
std::cerr << "RsGenExchange::publishMsgs() Publishing a Message";
@ -1858,7 +1858,7 @@ void RsGenExchange::publishMsgs()
}
else
{
pit->second.mAttempts++;
++pit->second.mAttempts;
}
}
@ -1978,7 +1978,7 @@ void RsGenExchange::processGroupUpdatePublish()
std::map<RsGxsGroupId, RsGxsGrpMetaData*> grpMeta;
std::vector<GroupUpdatePublish>::iterator vit = mGroupUpdatePublish.begin();
for(; vit != mGroupUpdatePublish.end(); vit++)
for(; vit != mGroupUpdatePublish.end(); ++vit)
{
GroupUpdatePublish& gup = *vit;
const RsGxsGroupId& groupId = gup.grpItem->meta.mGroupId;
@ -1992,7 +1992,7 @@ void RsGenExchange::processGroupUpdatePublish()
// now
vit = mGroupUpdatePublish.begin();
for(; vit != mGroupUpdatePublish.end(); vit++)
for(; vit != mGroupUpdatePublish.end(); ++vit)
{
GroupUpdatePublish& gup = *vit;
const RsGxsGroupId& groupId = gup.grpItem->meta.mGroupId;
@ -2057,7 +2057,7 @@ void RsGenExchange::processGroupDelete()
std::map<uint32_t, GrpNote> toNotify;
std::vector<GroupDeletePublish>::iterator vit = mGroupDeletePublish.begin();
for(; vit != mGroupDeletePublish.end(); vit++)
for(; vit != mGroupDeletePublish.end(); ++vit)
{
GroupDeletePublish& gdp = *vit;
uint32_t token = gdp.mToken;
@ -2072,7 +2072,7 @@ void RsGenExchange::processGroupDelete()
std::list<RsGxsGroupId> grpDeleted;
std::map<uint32_t, GrpNote>::iterator mit = toNotify.begin();
for(; mit != toNotify.end(); mit++)
for(; mit != toNotify.end(); ++mit)
{
GrpNote& note = mit->second;
uint8_t status = note.first ? RsTokenService::GXS_REQUEST_V2_STATUS_COMPLETE
@ -2102,7 +2102,7 @@ bool RsGenExchange::checkKeys(const RsTlvSecurityKeySet& keySet)
const keyMap& allKeys = keySet.keys;
keyMap::const_iterator cit = allKeys.begin();
bool adminFound = false, publishFound = false;
for(; cit != allKeys.end(); cit++)
for(; cit != allKeys.end(); ++cit)
{
const RsTlvSecurityKey& key = cit->second;
if(key.keyFlags & RSTLV_KEY_TYPE_FULL)
@ -2172,7 +2172,7 @@ void RsGenExchange::publishGrps()
std::map<RsGxsId, RsTlvSecurityKey>::iterator mit_keys = privatekeySet.keys.begin();
bool privKeyFound = false;
for(; mit_keys != privatekeySet.keys.end(); mit_keys++)
for(; mit_keys != privatekeySet.keys.end(); ++mit_keys)
{
RsTlvSecurityKey& key = mit_keys->second;
@ -2290,7 +2290,7 @@ void RsGenExchange::publishGrps()
std::cerr << "RsGenExchange::publishGrps() failed grp, trying again " << std::endl;
#endif
ggps.mLastAttemptTS = time(NULL);
vit++;
++vit;
}
else if(create == CREATE_SUCCESS)
{
@ -2311,7 +2311,7 @@ void RsGenExchange::publishGrps()
std::map<uint32_t, GrpNote>::iterator mit = toNotify.begin();
std::list<RsGxsGroupId> grpChanged;
for(; mit != toNotify.end(); mit++)
for(; mit != toNotify.end(); ++mit)
{
GrpNote& note = mit->second;
uint8_t status = note.first ? RsTokenService::GXS_REQUEST_V2_STATUS_COMPLETE
@ -2439,7 +2439,7 @@ void RsGenExchange::processRecvdMessages()
std::cerr << " movign to recvd." << std::endl;
#endif
mReceivedMsgs.push_back(gpsi.mItem);
pend_it++;
++pend_it;
}
}
@ -2453,7 +2453,7 @@ void RsGenExchange::processRecvdMessages()
std::map<RsGxsGroupId, RsGxsGrpMetaData*> grpMetas;
// coalesce group meta retrieval for performance
for(; vit != mReceivedMsgs.end(); vit++)
for(; vit != mReceivedMsgs.end(); ++vit)
{
RsNxsMsg* msg = *vit;
grpMetas.insert(std::make_pair(msg->grpId, (RsGxsGrpMetaData*)NULL));
@ -2464,7 +2464,7 @@ void RsGenExchange::processRecvdMessages()
#ifdef GEN_EXCH_DEBUG
std::cerr << " updating received messages:" << std::endl;
#endif
for(vit = mReceivedMsgs.begin(); vit != mReceivedMsgs.end(); vit++)
for(vit = mReceivedMsgs.begin(); vit != mReceivedMsgs.end(); ++vit)
{
RsNxsMsg* msg = *vit;
RsGxsMsgMetaData* meta = new RsGxsMsgMetaData();
@ -2703,7 +2703,7 @@ void RsGenExchange::processRecvdGroups()
if(erase)
vit = mReceivedGrps.erase(vit);
else
vit++;
++vit;
}
if(!grpIds.empty())
@ -2729,7 +2729,7 @@ void RsGenExchange::performUpdateValidation()
std::map<RsGxsGroupId, RsGxsGrpMetaData*> grpMetas;
std::vector<GroupUpdate>::iterator vit = mGroupUpdates.begin();
for(; vit != mGroupUpdates.end(); vit++)
for(; vit != mGroupUpdates.end(); ++vit)
grpMetas.insert(std::make_pair(vit->newGrp->grpId, (RsGxsGrpMetaData*)NULL));
if(!grpMetas.empty())
@ -2738,7 +2738,7 @@ void RsGenExchange::performUpdateValidation()
return;
vit = mGroupUpdates.begin();
for(; vit != mGroupUpdates.end(); vit++)
for(; vit != mGroupUpdates.end(); ++vit)
{
GroupUpdate& gu = *vit;
std::map<RsGxsGroupId, RsGxsGrpMetaData*>::iterator mit =
@ -2753,7 +2753,7 @@ void RsGenExchange::performUpdateValidation()
vit = mGroupUpdates.begin();
std::map<RsNxsGrp*, RsGxsGrpMetaData*> grps;
for(; vit != mGroupUpdates.end(); vit++)
for(; vit != mGroupUpdates.end(); ++vit)
{
GroupUpdate& gu = *vit;
@ -2827,7 +2827,7 @@ void RsGenExchange::removeDeleteExistingMessages( RsGeneralDataService::MsgStore
RsGxsGroupId::std_set mGrpIdsUnique;
for(RsGeneralDataService::MsgStoreMap::const_iterator cit = msgs.begin(); cit != msgs.end(); cit++)
for(RsGeneralDataService::MsgStoreMap::const_iterator cit = msgs.begin(); cit != msgs.end(); ++cit)
mGrpIdsUnique.insert(cit->second->mGroupId);
//RsGxsGroupId::std_list grpIds(mGrpIdsUnique.begin(), mGrpIdsUnique.end());
@ -2836,7 +2836,7 @@ void RsGenExchange::removeDeleteExistingMessages( RsGeneralDataService::MsgStore
MsgIdReq msgIdReq;
// now get a list of all msgs ids for each group
for(RsGxsGroupId::std_set::const_iterator it(mGrpIdsUnique.begin()); it != mGrpIdsUnique.end(); it++)
for(RsGxsGroupId::std_set::const_iterator it(mGrpIdsUnique.begin()); it != mGrpIdsUnique.end(); ++it)
{
mDataStore->retrieveMsgIds(*it, msgIdReq[*it]);
@ -2853,7 +2853,7 @@ void RsGenExchange::removeDeleteExistingMessages( RsGeneralDataService::MsgStore
RsGeneralDataService::MsgStoreMap filtered;
// now for each msg to be stored that exist in the retrieved msg/grp "index" delete and erase from map
for(RsGeneralDataService::MsgStoreMap::iterator cit2 = msgs.begin(); cit2 != msgs.end(); cit2++)
for(RsGeneralDataService::MsgStoreMap::iterator cit2 = msgs.begin(); cit2 != msgs.end(); ++cit2)
{
const RsGxsMessageId::std_vector& msgIds = msgIdReq[cit2->second->mGroupId];

10
libretroshare/src/gxs/rsgenexchange.h
View file

@ -323,7 +323,7 @@ protected:
bool ok = getGroupData(token, items);
std::vector<RsGxsGrpItem*>::iterator vit = items.begin();
for(; vit != items.end(); vit++)
for(; vit != items.end(); ++vit)
{
RsGxsGrpItem* gi = *vit;
@ -363,12 +363,12 @@ public:
GxsMsgDataMap::iterator mit = msgData.begin();
for(; mit != msgData.end(); mit++)
for(; mit != msgData.end(); ++mit)
{
const RsGxsGroupId& grpId = mit->first;
std::vector<RsGxsMsgItem*>& mv = mit->second;
std::vector<RsGxsMsgItem*>::iterator vit = mv.begin();
for(; vit != mv.end(); vit++)
for(; vit != mv.end(); ++vit)
{
RsGxsMsgItem* mi = *vit;
MsgType* mt = dynamic_cast<MsgType*>(mi);
@ -415,14 +415,14 @@ protected:
if(ok)
{
for(; mit != msgResult.end(); mit++)
for(; mit != msgResult.end(); ++mit)
{
std::vector<MsgType> gxsMsgItems;
const RsGxsGrpMsgIdPair& msgId = mit->first;
std::vector<RsNxsMsg*>& nxsMsgsV = mit->second;
std::vector<RsNxsMsg*>::iterator vit
= nxsMsgsV.begin();
for(; vit != nxsMsgsV.end(); vit++)
for(; vit != nxsMsgsV.end(); ++vit)
{
RsNxsMsg*& msg = *vit;
RsItem* item = NULL;

68
libretroshare/src/gxs/rsgxsdataaccess.cc
View file

@ -184,7 +184,7 @@ bool RsGxsDataAccess::requestMsgInfo(uint32_t &token, uint32_t ansType,
GxsMsgReq::const_iterator mit = msgIds.begin();
std::vector<RsGxsGroupId> toRemove;
for(; mit != msgIds.end(); mit++)
for(; mit != msgIds.end(); ++mit)
{
if(mit->second.empty())
toRemove.push_back(mit->first);
@ -194,7 +194,7 @@ bool RsGxsDataAccess::requestMsgInfo(uint32_t &token, uint32_t ansType,
GxsMsgReq filteredMsgIds = msgIds;
for(; vit != toRemove.end(); vit++)
for(; vit != toRemove.end(); ++vit)
filteredMsgIds.erase(*vit);
if(reqType & GXS_REQUEST_TYPE_MSG_META)
@ -247,7 +247,7 @@ bool RsGxsDataAccess::requestMsgInfo(uint32_t &token, uint32_t ansType,
{
MsgMetaReq* mmr = new MsgMetaReq();
for(; lit != grpIds.end(); lit++)
for(; lit != grpIds.end(); ++lit)
mmr->mMsgIds[*lit] = std::vector<RsGxsMessageId>();
req = mmr;
@ -255,7 +255,7 @@ bool RsGxsDataAccess::requestMsgInfo(uint32_t &token, uint32_t ansType,
{
MsgDataReq* mdr = new MsgDataReq();
for(; lit != grpIds.end(); lit++)
for(; lit != grpIds.end(); ++lit)
mdr->mMsgIds[*lit] = std::vector<RsGxsMessageId>();
req = mdr;
@ -263,7 +263,7 @@ bool RsGxsDataAccess::requestMsgInfo(uint32_t &token, uint32_t ansType,
{
MsgIdReq* mir = new MsgIdReq();
for(; lit != grpIds.end(); lit++)
for(; lit != grpIds.end(); ++lit)
mir->mMsgIds[*lit] = std::vector<RsGxsMessageId>();
req = mir;
@ -733,7 +733,7 @@ void RsGxsDataAccess::processRequests()
GroupStatisticRequest* gsr;
ServiceStatisticRequest* ssr;
for(it = mRequests.begin(); it != mRequests.end(); it++)
for(it = mRequests.begin(); it != mRequests.end(); ++it)
{
GxsRequest* req = it->second;
@ -818,7 +818,7 @@ void RsGxsDataAccess::processRequests()
} // END OF MUTEX.
for(cit = toClear.begin(); cit != toClear.end(); cit++)
for(cit = toClear.begin(); cit != toClear.end(); ++cit)
{
clearRequest(*cit);
}
@ -902,7 +902,7 @@ bool RsGxsDataAccess::getGroupData(GroupDataReq* req)
std::list<RsGxsGroupId>::iterator lit = grpIdsOut.begin(),
lit_end = grpIdsOut.end();
for(; lit != lit_end; lit++)
for(; lit != lit_end; ++lit)
{
grpData[*lit] = NULL;
}
@ -910,7 +910,7 @@ bool RsGxsDataAccess::getGroupData(GroupDataReq* req)
bool ok = mDataStore->retrieveNxsGrps(grpData, true, true);
std::map<RsGxsGroupId, RsNxsGrp*>::iterator mit = grpData.begin();
for(; mit != grpData.end(); mit++)
for(; mit != grpData.end(); ++mit)
req->mGroupData.push_back(mit->second);
return ok;
@ -930,14 +930,14 @@ bool RsGxsDataAccess::getGroupSummary(GroupMetaReq* req)
std::list<RsGxsGroupId>::const_iterator lit = grpIdsOut.begin();
for(; lit != grpIdsOut.end(); lit++)
for(; lit != grpIdsOut.end(); ++lit)
grpMeta[*lit] = NULL;
mDataStore->retrieveGxsGrpMetaData(grpMeta);
std::map<RsGxsGroupId, RsGxsGrpMetaData*>::iterator mit = grpMeta.begin();
for(; mit != grpMeta.end(); mit++)
for(; mit != grpMeta.end(); ++mit)
req->mGroupMetaData.push_back(mit->second);
return true;
@ -956,21 +956,21 @@ bool RsGxsDataAccess::getGroupList(const std::list<RsGxsGroupId>& grpIdsIn, cons
std::list<RsGxsGroupId>::const_iterator lit = grpIdsIn.begin();
for(; lit != grpIdsIn.end(); lit++)
for(; lit != grpIdsIn.end(); ++lit)
grpMeta[*lit] = NULL;
mDataStore->retrieveGxsGrpMetaData(grpMeta);
std::map<RsGxsGroupId, RsGxsGrpMetaData*>::iterator mit = grpMeta.begin();
for(; mit != grpMeta.end(); mit++)
for(; mit != grpMeta.end(); ++mit)
{
grpIdsOut.push_back(mit->first);
}
filterGrpList(grpIdsOut, opts, grpMeta);
for(mit = grpMeta.begin(); mit != grpMeta.end(); mit++)
for(mit = grpMeta.begin(); mit != grpMeta.end(); ++mit)
{
delete mit->second; // so wasteful!!
}
@ -1053,7 +1053,7 @@ bool RsGxsDataAccess::getMsgList(const GxsMsgReq& msgIds, const RsTokReqOptions&
GxsMsgMetaResult::iterator meta_it;
MsgMetaFilter metaFilter;
for(meta_it = result.begin(); meta_it != result.end(); meta_it++)
for(meta_it = result.begin(); meta_it != result.end(); ++meta_it)
{
const RsGxsGroupId& grpId = meta_it->first;
@ -1068,7 +1068,7 @@ bool RsGxsDataAccess::getMsgList(const GxsMsgReq& msgIds, const RsTokReqOptions&
std::map<RsGxsMessageId, std::pair<RsGxsMessageId, time_t> > origMsgTs;
std::map<RsGxsMessageId, std::pair<RsGxsMessageId, time_t> >::iterator oit;
for(; vit != metaV.end(); vit++)
for(; vit != metaV.end(); ++vit)
{
RsGxsMsgMetaData* msgMeta = *vit;
@ -1118,7 +1118,7 @@ bool RsGxsDataAccess::getMsgList(const GxsMsgReq& msgIds, const RsTokReqOptions&
}
// Add the discovered Latest Msgs.
for(oit = origMsgTs.begin(); oit != origMsgTs.end(); oit++)
for(oit = origMsgTs.begin(); oit != origMsgTs.end(); ++oit)
{
msgIdsOut[grpId].push_back(oit->second.first);
}
@ -1128,7 +1128,7 @@ bool RsGxsDataAccess::getMsgList(const GxsMsgReq& msgIds, const RsTokReqOptions&
{
std::vector<RsGxsMsgMetaData*>::const_iterator vit = metaV.begin();
for(; vit != metaV.end(); vit++)
for(; vit != metaV.end(); ++vit)
{
RsGxsMsgMetaData* msgMeta = *vit;
bool add = false;
@ -1292,7 +1292,7 @@ bool RsGxsDataAccess::getMsgRelatedInfo(MsgRelatedInfoReq *req)
std::vector<RsGxsGrpMsgIdPair>::iterator vit_msgIds = req->mMsgIds.begin();
for(; vit_msgIds != req->mMsgIds.end(); vit_msgIds++)
for(; vit_msgIds != req->mMsgIds.end(); ++vit_msgIds)
{
MsgMetaFilter filterMap;
@ -1314,7 +1314,7 @@ bool RsGxsDataAccess::getMsgRelatedInfo(MsgRelatedInfoReq *req)
std::vector<RsGxsMessageId> outMsgIds;
RsGxsMsgMetaData* origMeta = NULL;
for(vit_meta = metaV.begin(); vit_meta != metaV.end(); vit_meta++)
for(vit_meta = metaV.begin(); vit_meta != metaV.end(); ++vit_meta)
{
RsGxsMsgMetaData* meta = *vit_meta;
@ -1345,7 +1345,7 @@ bool RsGxsDataAccess::getMsgRelatedInfo(MsgRelatedInfoReq *req)
// RUN THROUGH ALL MSGS... in map origId -> TS.
std::map<RsGxsMessageId, std::pair<RsGxsMessageId, time_t> > origMsgTs;
std::map<RsGxsMessageId, std::pair<RsGxsMessageId, time_t> >::iterator oit;
for(vit_meta = metaV.begin(); vit_meta != metaV.end(); vit_meta++)
for(vit_meta = metaV.begin(); vit_meta != metaV.end(); ++vit_meta)
{
RsGxsMsgMetaData* meta = *vit_meta;
@ -1404,7 +1404,7 @@ bool RsGxsDataAccess::getMsgRelatedInfo(MsgRelatedInfoReq *req)
}
// Add the discovered Latest Msgs.
for(oit = origMsgTs.begin(); oit != origMsgTs.end(); oit++)
for(oit = origMsgTs.begin(); oit != origMsgTs.end(); ++oit)
{
outMsgIds.push_back(oit->second.first);
}
@ -1417,7 +1417,7 @@ bool RsGxsDataAccess::getMsgRelatedInfo(MsgRelatedInfoReq *req)
RsGxsMessageId latestMsgId;
RsGxsMsgMetaData* latestMeta;
for(vit_meta = metaV.begin(); vit_meta != metaV.end(); vit_meta++)
for(vit_meta = metaV.begin(); vit_meta != metaV.end(); ++vit_meta)
{
RsGxsMsgMetaData* meta = *vit_meta;
@ -1437,7 +1437,7 @@ bool RsGxsDataAccess::getMsgRelatedInfo(MsgRelatedInfoReq *req)
}
else if (onlyAllVersions)
{
for(vit_meta = metaV.begin(); vit_meta != metaV.end(); vit_meta++)
for(vit_meta = metaV.begin(); vit_meta != metaV.end(); ++vit_meta)
{
RsGxsMsgMetaData* meta = *vit_meta;
@ -1499,7 +1499,7 @@ bool RsGxsDataAccess::getGroupStatistic(GroupStatisticRequest *req)
req->mGroupStatistic.mNumChildMsgsNew = 0;
req->mGroupStatistic.mNumChildMsgsUnread = 0;
for(int i = 0; i < msgMetaV.size(); i++)
for(int i = 0; i < msgMetaV.size(); ++i)
{
RsGxsMsgMetaData* m = msgMetaV[i];
req->mGroupStatistic.mTotalSizeOfMsgs += m->mMsgSize + m->serial_size();
@ -1547,7 +1547,7 @@ bool RsGxsDataAccess::getServiceStatistic(ServiceStatisticRequest *req)
req->mServiceStatistic.mNumChildMsgsNew = 0;
req->mServiceStatistic.mNumChildMsgsUnread = 0;
for(; mit != grpMeta.end(); mit++)
for(; mit != grpMeta.end(); ++mit)
{
RsGxsGrpMetaData* m = mit->second;
req->mServiceStatistic.mSizeOfGrps += m->mGrpSize + m->serial_size();
@ -1586,14 +1586,14 @@ bool RsGxsDataAccess::getMsgList(MsgIdReq* req)
GxsMsgMetaResult::iterator mit = result.begin(), mit_end = result.end();
for(; mit != mit_end; mit++)
for(; mit != mit_end; ++mit)
{
const RsGxsGroupId grpId = mit->first;
std::vector<RsGxsMsgMetaData*>& metaV = mit->second;
std::vector<RsGxsMsgMetaData*>::iterator vit = metaV.begin(),
vit_end = metaV.end();
for(; vit != vit_end; vit++)
for(; vit != vit_end; ++vit)
{
RsGxsMsgMetaData* meta = *vit;
req->mMsgIdResult[grpId].push_back(meta->mMsgId);
@ -1614,12 +1614,12 @@ void RsGxsDataAccess::cleanseMsgMetaMap(GxsMsgMetaResult& result)
{
GxsMsgMetaResult::iterator mit = result.begin();
for(; mit !=result.end(); mit++)
for(; mit !=result.end(); ++mit)
{
std::vector<RsGxsMsgMetaData*>& msgMetaV = mit->second;
std::vector<RsGxsMsgMetaData*>::iterator vit = msgMetaV.begin();
for(; vit != msgMetaV.end(); vit++)
for(; vit != msgMetaV.end(); ++vit)
{
delete *vit;
}
@ -1634,7 +1634,7 @@ void RsGxsDataAccess::filterMsgList(GxsMsgIdResult& msgIds, const RsTokReqOption
{
GxsMsgIdResult::iterator mit = msgIds.begin();
for(;mit != msgIds.end(); mit++)
for(;mit != msgIds.end(); ++mit)
{
MsgMetaFilter::const_iterator cit = msgMetas.find(mit->first);
@ -1658,7 +1658,7 @@ void RsGxsDataAccess::filterMsgList(GxsMsgIdResult& msgIds, const RsTokReqOption
if(keep)
{
vit++;
++vit;
}else
{
vit = msgs.erase(vit);
@ -1684,7 +1684,7 @@ void RsGxsDataAccess::filterGrpList(std::list<RsGxsGroupId> &grpIds, const RsTok
if(keep)
{
lit++;
++lit;
}else
{
lit = grpIds.erase(lit);
@ -1749,7 +1749,7 @@ void RsGxsDataAccess::tokenList(std::list<uint32_t>& tokens)
std::map<uint32_t, GxsRequest*>::iterator mit = mRequests.begin();
for(; mit != mRequests.end(); mit++)
for(; mit != mRequests.end(); ++mit)
{
tokens.push_back(mit->first);
}

104
libretroshare/src/gxs/rsgxsnetservice.cc
View file

@ -109,7 +109,7 @@ void RsGxsNetService::syncWithPeers()
if(mGrpAutoSync)
{
// for now just grps
for(; sit != peers.end(); sit++)
for(; sit != peers.end(); ++sit)
{
const RsPeerId peerId = *sit;
@ -141,7 +141,7 @@ void RsGxsNetService::syncWithPeers()
GrpMetaMap toRequest;
for(; mit != grpMeta.end(); mit++)
for(; mit != grpMeta.end(); ++mit)
{
RsGxsGrpMetaData* meta = mit->second;
@ -157,7 +157,7 @@ void RsGxsNetService::syncWithPeers()
sit = peers.begin();
// synchronise group msg for groups which we're subscribed to
for(; sit != peers.end(); sit++)
for(; sit != peers.end(); ++sit)
{
const RsPeerId& peerId = *sit;
@ -174,7 +174,7 @@ void RsGxsNetService::syncWithPeers()
}
GrpMetaMap::const_iterator mmit = toRequest.begin();
for(; mmit != toRequest.end(); mmit++)
for(; mmit != toRequest.end(); ++mmit)
{
const RsGxsGrpMetaData* meta = mmit->second;
const RsGxsGroupId& grpId = mmit->first;
@ -204,7 +204,7 @@ void RsGxsNetService::syncWithPeers()
}
GrpMetaMap::iterator mmit = toRequest.begin();
for(; mmit != toRequest.end(); mmit++)
for(; mmit != toRequest.end(); ++mmit)
{
delete mmit->second;
}
@ -222,7 +222,7 @@ bool RsGxsNetService::fragmentMsg(RsNxsMsg& msg, MsgFragments& msgFragments) con
int currPos = 0;
for(uint8_t i=0; i < nFragments; i++)
for(uint8_t i=0; i < nFragments; ++i)
{
RsNxsMsg* msgFrag = new RsNxsMsg(mServType);
msgFrag->grpId = msg.grpId;
@ -255,7 +255,7 @@ bool RsGxsNetService::fragmentGrp(RsNxsGrp& grp, GrpFragments& grpFragments) con
int currPos = 0;
for(uint8_t i=0; i < nFragments; i++)
for(uint8_t i=0; i < nFragments; ++i)
{
RsNxsGrp* grpFrag = new RsNxsGrp(mServType);
grpFrag->grpId = grp.grpId;
@ -294,13 +294,13 @@ RsNxsMsg* RsGxsNetService::deFragmentMsg(MsgFragments& msgFragments) const
MsgFragments::iterator mit = msgFragments.begin();
uint32_t datSize = 0;
for(; mit != msgFragments.end(); mit++)
for(; mit != msgFragments.end(); ++mit)
datSize += (*mit)->msg.bin_len;
char* data = new char[datSize];
uint32_t currPos = 0;
for(mit = msgFragments.begin(); mit != msgFragments.end(); mit++)
for(mit = msgFragments.begin(); mit != msgFragments.end(); ++mit)
{
RsNxsMsg* msg = *mit;
memcpy(data + (currPos), msg->msg.bin_data, msg->msg.bin_len);
@ -327,13 +327,13 @@ RsNxsGrp* RsGxsNetService::deFragmentGrp(GrpFragments& grpFragments) const
GrpFragments::iterator mit = grpFragments.begin();
uint32_t datSize = 0;
for(; mit != grpFragments.end(); mit++)
for(; mit != grpFragments.end(); ++mit)
datSize += (*mit)->grp.bin_len;
char* data = new char[datSize];
uint32_t currPos = 0;
for(mit = grpFragments.begin(); mit != grpFragments.end(); mit++)
for(mit = grpFragments.begin(); mit != grpFragments.end(); ++mit)
{
RsNxsGrp* grp = *mit;
memcpy(data + (currPos), grp->grp.bin_data, grp->grp.bin_len);
@ -365,7 +365,7 @@ void RsGxsNetService::locked_createTransactionFromPending(
MsgAuthorV::const_iterator cit = msgPend->mMsgAuthV.begin();
std::list<RsNxsItem*> reqList;
uint32_t transN = locked_getTransactionId();
for(; cit != msgPend->mMsgAuthV.end(); cit++)
for(; cit != msgPend->mMsgAuthV.end(); ++cit)
{
const MsgAuthEntry& entry = *cit;
@ -392,7 +392,7 @@ void RsGxsNetService::locked_createTransactionFromPending(
GrpAuthorV::const_iterator cit = grpPend->mGrpAuthV.begin();
std::list<RsNxsItem*> reqList;
uint32_t transN = locked_getTransactionId();
for(; cit != grpPend->mGrpAuthV.end(); cit++)
for(; cit != grpPend->mGrpAuthV.end(); ++cit)
{
const GrpAuthEntry& entry = *cit;
@ -429,7 +429,7 @@ void RsGxsNetService::locked_createTransactionFromPending(GrpCircleIdRequestVett
std::vector<GrpIdCircleVet>::iterator cit = grpPend->mGrpCircleV.begin();
uint32_t transN = locked_getTransactionId();
std::list<RsNxsItem*> itemL;
for(; cit != grpPend->mGrpCircleV.end(); cit++)
for(; cit != grpPend->mGrpCircleV.end(); ++cit)
{
const GrpIdCircleVet& entry = *cit;
if(entry.mCleared)
@ -469,7 +469,7 @@ void RsGxsNetService::locked_createTransactionFromPending(MsgCircleIdsRequestVet
uint32_t transN = locked_getTransactionId();
for(; vit != msgPend->mMsgs.end(); vit++)
for(; vit != msgPend->mMsgs.end(); ++vit)
{
MsgIdCircleVet& mic = *vit;
RsNxsSyncMsgItem* mItem = new
@ -524,12 +524,12 @@ void RsGxsNetService::collateGrpFragments(GrpFragments fragments,
GrpFragments::iterator vit = fragments.begin();
std::set<RsGxsGroupId> grpIds;
for(; vit != fragments.end(); vit++)
for(; vit != fragments.end(); ++vit)
grpIds.insert( (*vit)->grpId );
std::set<RsGxsGroupId>::iterator sit = grpIds.begin();
for(; sit != grpIds.end(); sit++)
for(; sit != grpIds.end(); ++sit)
{
const RsGxsGroupId& grpId = *sit;
GrpFragments::iterator bound = std::partition(
@ -552,7 +552,7 @@ void RsGxsNetService::collateGrpFragments(GrpFragments fragments,
{
GrpFragments::iterator vit2 = f.begin();
for(; vit2 != f.end(); vit2++)
for(; vit2 != f.end(); ++vit2)
delete *vit2;
partFragments.erase(grpId);
@ -575,13 +575,13 @@ void RsGxsNetService::collateMsgFragments(MsgFragments fragments, std::map<RsGxs
MsgFragments::iterator vit = fragments.begin();
std::set<RsGxsMessageId> msgIds;
for(; vit != fragments.end(); vit++)
for(; vit != fragments.end(); ++vit)
msgIds.insert( (*vit)->msgId );
std::set<RsGxsMessageId>::iterator sit = msgIds.begin();
for(; sit != msgIds.end(); sit++)
for(; sit != msgIds.end(); ++sit)
{
const RsGxsMessageId& msgId = *sit;
MsgFragments::iterator bound = std::partition(
@ -589,7 +589,7 @@ void RsGxsNetService::collateMsgFragments(MsgFragments fragments, std::map<RsGxs
MsgFragCollate(msgId));
// something will always be found for a group id
for(vit = fragments.begin(); vit != bound; vit++ )
for(vit = fragments.begin(); vit != bound; ++vit )
{
partFragments[msgId].push_back(*vit);
}
@ -604,7 +604,7 @@ void RsGxsNetService::collateMsgFragments(MsgFragments fragments, std::map<RsGxs
{
MsgFragments::iterator vit2 = f.begin();
for(; vit2 != f.end(); vit2++)
for(; vit2 != f.end(); ++vit2)
delete *vit2;
partFragments.erase(msgId);
@ -974,7 +974,7 @@ void RsGxsNetService::updateServerSyncTS()
bool change = false;
for(; mit != gxsMap.end(); mit++)
for(; mit != gxsMap.end(); ++mit)
{
const RsGxsGroupId& grpId = mit->first;
RsGxsGrpMetaData* grpMeta = mit->second;
@ -1024,7 +1024,7 @@ void RsGxsNetService::processTransactions(){
TransactionsPeerMap::iterator mit = mTransactions.begin();
for(; mit != mTransactions.end(); mit++){
for(; mit != mTransactions.end(); ++mit){
TransactionIdMap& transMap = mit->second;
TransactionIdMap::iterator mmit = transMap.begin(),
@ -1039,7 +1039,7 @@ void RsGxsNetService::processTransactions(){
*/
if(mit->first == mOwnId){
for(; mmit != mmit_end; mmit++){
for(; mmit != mmit_end; ++mmit){
NxsTransaction* tr = mmit->second;
uint16_t flag = tr->mFlag;
@ -1071,7 +1071,7 @@ void RsGxsNetService::processTransactions(){
lit = tr->mItems.begin();
lit_end = tr->mItems.end();
for(; lit != lit_end; lit++){
for(; lit != lit_end; ++lit){
sendItem(*lit);
}
@ -1119,7 +1119,7 @@ void RsGxsNetService::processTransactions(){
* involved in transaction
*/
for(; mmit != mmit_end; mmit++){
for(; mmit != mmit_end; ++mmit){
NxsTransaction* tr = mmit->second;
uint16_t flag = tr->mFlag;
@ -1197,7 +1197,7 @@ void RsGxsNetService::processTransactions(){
std::list<uint32_t>::iterator lit = toRemove.begin();
for(; lit != toRemove.end(); lit++)
for(; lit != toRemove.end(); ++lit)
{
transMap.erase(*lit);
}
@ -1356,7 +1356,7 @@ void RsGxsNetService::locked_processCompletedIncomingTrans(NxsTransaction* tr)
msgs.clear();
std::map<RsGxsGroupId, MsgFragments >::iterator mit = collatedMsgs.begin();
for(; mit != collatedMsgs.end(); mit++)
for(; mit != collatedMsgs.end(); ++mit)
{
MsgFragments& f = mit->second;
RsNxsMsg* msg = deFragmentMsg(f);
@ -1509,7 +1509,7 @@ void RsGxsNetService::locked_genReqMsgTransaction(NxsTransaction* tr)
std::list<RsNxsItem*>::iterator lit = tr->mItems.begin();
// first get item list sent from transaction
for(; lit != tr->mItems.end(); lit++)
for(; lit != tr->mItems.end(); ++lit)
{
RsNxsSyncMsgItem* item = dynamic_cast<RsNxsSyncMsgItem*>(*lit);
if(item)
@ -1569,7 +1569,7 @@ void RsGxsNetService::locked_genReqMsgTransaction(NxsTransaction* tr)
std::set<RsGxsMessageId> msgIdSet;
// put ids in set for each searching
for(; vit != msgMetaV.end(); vit++)
for(; vit != msgMetaV.end(); ++vit)
{
msgIdSet.insert((*vit)->mMsgId);
delete(*vit);
@ -1590,7 +1590,7 @@ void RsGxsNetService::locked_genReqMsgTransaction(NxsTransaction* tr)
std::list<RsPeerId> peers;
peers.push_back(tr->mTransaction->PeerId());
for(; llit != msgItemL.end(); llit++)
for(; llit != msgItemL.end(); ++llit)
{
RsNxsSyncMsgItem*& syncItem = *llit;
const RsGxsMessageId& msgId = syncItem->msgId;
@ -1700,7 +1700,7 @@ void RsGxsNetService::locked_genReqGrpTransaction(NxsTransaction* tr)
std::list<RsNxsItem*>::iterator lit = tr->mItems.begin();
for(; lit != tr->mItems.end(); lit++)
for(; lit != tr->mItems.end(); ++lit)
{
RsNxsSyncGrpItem* item = dynamic_cast<RsNxsSyncGrpItem*>(*lit);
if(item)
@ -1729,7 +1729,7 @@ void RsGxsNetService::locked_genReqGrpTransaction(NxsTransaction* tr)
std::list<RsPeerId> peers;
peers.push_back(tr->mTransaction->PeerId());
for(; llit != grpItemL.end(); llit++)
for(; llit != grpItemL.end(); ++llit)
{
RsNxsSyncGrpItem*& grpSyncItem = *llit;
const RsGxsGroupId& grpId = grpSyncItem->grpId;
@ -1795,7 +1795,7 @@ void RsGxsNetService::locked_genReqGrpTransaction(NxsTransaction* tr)
// clean up meta data
std::map<RsGxsGroupId, RsGxsGrpMetaData*>::iterator mit = grpMetaMap.begin();
for(; mit != grpMetaMap.end(); mit++)
for(; mit != grpMetaMap.end(); ++mit)
delete mit->second;
}
@ -1814,7 +1814,7 @@ void RsGxsNetService::locked_genSendGrpsTransaction(NxsTransaction* tr)
std::map<RsGxsGroupId, RsNxsGrp*> grps;
for(;lit != tr->mItems.end(); lit++)
for(;lit != tr->mItems.end(); ++lit)
{
RsNxsSyncGrpItem* item = dynamic_cast<RsNxsSyncGrpItem*>(*lit);
if (item)
@ -1845,7 +1845,7 @@ void RsGxsNetService::locked_genSendGrpsTransaction(NxsTransaction* tr)
// store grp items to send in transaction
std::map<RsGxsGroupId, RsNxsGrp*>::iterator mit = grps.begin();
RsPeerId peerId = tr->mTransaction->PeerId();
for(;mit != grps.end(); mit++)
for(;mit != grps.end(); ++mit)
{
mit->second->PeerId(peerId); // set so it gets sent to right peer
mit->second->transactionNumber = transN;
@ -1916,7 +1916,7 @@ void RsGxsNetService::runVetting()
}
else
{
vit++;
++vit;
}
}
@ -1957,7 +1957,7 @@ void RsGxsNetService::runVetting()
}
else
{
vit2++;
++vit2;
}
}
}
@ -1985,7 +1985,7 @@ void RsGxsNetService::locked_genSendMsgsTransaction(NxsTransaction* tr)
// hacky assumes a transaction only consist of a single grpId
RsGxsGroupId grpId;
for(;lit != tr->mItems.end(); lit++)
for(;lit != tr->mItems.end(); ++lit)
{
RsNxsSyncMsgItem* item = dynamic_cast<RsNxsSyncMsgItem*>(*lit);
if (item)
@ -2016,12 +2016,12 @@ void RsGxsNetService::locked_genSendMsgsTransaction(NxsTransaction* tr)
RsPeerId peerId = tr->mTransaction->PeerId();
uint32_t msgSize = 0;
for(;mit != msgs.end(); mit++)
for(;mit != msgs.end(); ++mit)
{
std::vector<RsNxsMsg*>& msgV = mit->second;
std::vector<RsNxsMsg*>::iterator vit = msgV.begin();
for(; vit != msgV.end(); vit++)
for(; vit != msgV.end(); ++vit)
{
RsNxsMsg* msg = *vit;
msg->PeerId(peerId);
@ -2036,7 +2036,7 @@ void RsGxsNetService::locked_genSendMsgsTransaction(NxsTransaction* tr)
MsgFragments::iterator mit = fragments.begin();
for(; mit != fragments.end(); mit++)
for(; mit != fragments.end(); ++mit)
{
newTr->mItems.push_back(*mit);
msgSize++;
@ -2106,7 +2106,7 @@ void RsGxsNetService::cleanTransactionItems(NxsTransaction* tr) const
{
std::list<RsNxsItem*>::iterator lit = tr->mItems.begin();
for(; lit != tr->mItems.end(); lit++)
for(; lit != tr->mItems.end(); ++lit)
{
delete *lit;
}
@ -2196,7 +2196,7 @@ void RsGxsNetService::handleRecvSyncGroup(RsNxsSyncGrp* item)
std::cerr << "RsGxsNetService::handleRecvSyncGroup() \nService: " << mServType << "\nGroup list beings being sent: " << std::endl;
#endif
for(; mit != grp.end(); mit++)
for(; mit != grp.end(); ++mit)
{
RsGxsGrpMetaData* grpMeta = mit->second;
@ -2546,7 +2546,7 @@ void RsGxsNetService::handleRecvSyncMessage(RsNxsSyncMsg* item)
{
std::vector<RsGxsMsgMetaData*>::iterator vit = msgMetas.begin();
for(; vit != msgMetas.end(); vit++)
for(; vit != msgMetas.end(); ++vit)
{
RsGxsMsgMetaData* m = *vit;
@ -2567,7 +2567,7 @@ void RsGxsNetService::handleRecvSyncMessage(RsNxsSyncMsg* item)
std::vector<RsGxsMsgMetaData*>::iterator vit = msgMetas.begin();
// release meta resource
for(vit = msgMetas.begin(); vit != msgMetas.end(); vit++)
for(vit = msgMetas.begin(); vit != msgMetas.end(); ++vit)
delete *vit;
delete(grpMeta);
@ -2630,7 +2630,7 @@ bool RsGxsNetService::canSendMsgIds(const std::vector<RsGxsMsgMetaData*>& msgMet
std::vector<MsgIdCircleVet> toVet;
std::vector<RsGxsMsgMetaData*>::const_iterator vit = msgMetas.begin();
for(; vit != msgMetas.end(); vit++)
for(; vit != msgMetas.end(); ++vit)
{
const RsGxsMsgMetaData* const& meta = *vit;
@ -2661,7 +2661,7 @@ bool RsGxsNetService::canSendMsgIds(const std::vector<RsGxsMsgMetaData*>& msgMet
std::vector<MsgIdCircleVet> toVet;
std::vector<RsGxsMsgMetaData*>::const_iterator vit = msgMetas.begin();
for(; vit != msgMetas.end(); vit++)
for(; vit != msgMetas.end(); ++vit)
{
const RsGxsMsgMetaData* const& meta = *vit;
@ -2715,7 +2715,7 @@ void RsGxsNetService::processExplicitGroupRequests()
std::map<RsPeerId, std::list<RsGxsGroupId> >::const_iterator cit = mExplicitRequest.begin();
for(; cit != mExplicitRequest.end(); cit++)
for(; cit != mExplicitRequest.end(); ++cit)
{
const RsPeerId& peerId = cit->first;
const std::list<RsGxsGroupId>& groupIdList = cit->second;
@ -2723,7 +2723,7 @@ void RsGxsNetService::processExplicitGroupRequests()
std::list<RsNxsItem*> grpSyncItems;
std::list<RsGxsGroupId>::const_iterator git = groupIdList.begin();
uint32_t transN = locked_getTransactionId();
for(; git != groupIdList.end(); git++)
for(; git != groupIdList.end(); ++git)
{
RsNxsSyncGrpItem* item = new RsNxsSyncGrpItem(mServType);
item->grpId = *git;
@ -2869,7 +2869,7 @@ void RsGxsNetService::sharePublishKeysPending()
}
// delete pending peer list which are done with
for(std::list<RsGxsGroupId>::const_iterator lit = toDelete.begin(); lit != toDelete.end(); lit++)
for(std::list<RsGxsGroupId>::const_iterator lit = toDelete.begin(); lit != toDelete.end(); ++lit)
mPendingPublishKeyRecipients.erase(*lit);
}

8
libretroshare/src/gxs/rsgxsnetutils.cc
View file

@ -90,7 +90,7 @@ bool MsgRespPending::accepted()
{
MsgAuthorV::iterator cit = mMsgAuthV.begin();
MsgAuthorV::size_type count = 0;
for(; cit != mMsgAuthV.end(); cit++)
for(; cit != mMsgAuthV.end(); ++cit)
{
MsgAuthEntry& entry = *cit;
@ -124,7 +124,7 @@ bool GrpRespPending::accepted()
{
GrpAuthorV::iterator cit = mGrpAuthV.begin();
GrpAuthorV::size_type count = 0;
for(; cit != mGrpAuthV.end(); cit++)
for(; cit != mGrpAuthV.end(); ++cit)
{
GrpAuthEntry& entry = *cit;
@ -171,7 +171,7 @@ NxsTransaction::~NxsTransaction(){
std::list<RsNxsItem*>::iterator lit = mItems.begin();
for(; lit != mItems.end(); lit++)
for(; lit != mItems.end(); ++lit)
{
delete *lit;
*lit = NULL;
@ -244,7 +244,7 @@ GrpCircleIdRequestVetting::GrpCircleIdRequestVetting(
bool GrpCircleIdRequestVetting::cleared()
{
std::vector<GrpIdCircleVet>::size_type i, count;
for(i = 0; i < mGrpCircleV.size(); i++)
for(i = 0; i < mGrpCircleV.size(); ++i)
{
GrpIdCircleVet& gic = mGrpCircleV[i];

10
libretroshare/src/gxs/rsgxsutil.cc
View file

@ -39,7 +39,7 @@ RsGxsMessageCleanUp::RsGxsMessageCleanUp(RsGeneralDataService* const dataService
std::map<RsGxsGroupId, RsGxsGrpMetaData*>::iterator cit = grpMeta.begin();
for(;cit != grpMeta.end(); cit++)
for(;cit != grpMeta.end(); ++cit)
{
mGrpMeta.push_back(cit->second);
}
@ -67,7 +67,7 @@ bool RsGxsMessageCleanUp::clean()
req.clear();
for(; mit != result.end(); mit++)
for(; mit != result.end(); ++mit)
{
std::vector<RsGxsMsgMetaData*>& metaV = mit->second;
std::vector<RsGxsMsgMetaData*>::iterator vit = metaV.begin();
@ -129,7 +129,7 @@ bool RsGxsIntegrityCheck::check()
// compute hash and compare to stored value, if it fails then simply add it
// to list
std::map<RsGxsGroupId, RsNxsGrp*>::iterator git = grp.begin();
for(; git != grp.end(); git++)
for(; git != grp.end(); ++git)
{
RsNxsGrp* grp = git->second;
RsFileHash currHash;
@ -198,12 +198,12 @@ bool RsGxsIntegrityCheck::check()
GxsMsgResult::iterator mit = msgs.begin();
for(; mit != msgs.end(); mit++)
for(; mit != msgs.end(); ++mit)
{
std::vector<RsNxsMsg*>& msgV = mit->second;
std::vector<RsNxsMsg*>::iterator vit = msgV.begin();
for(; vit != msgV.end(); vit++)
for(; vit != msgV.end(); ++vit)
{
RsNxsMsg* msg = *vit;
RsFileHash currHash;

2
libretroshare/src/gxs/rsgxsutil.h
View file

@ -39,7 +39,7 @@ void freeAndClearContainerResource(Container container)
{
typename Container::iterator meta_it = container.begin();
for(; meta_it != container.end(); meta_it++)
for(; meta_it != container.end(); ++meta_it)
{
delete meta_it->second;