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

Removed some std::ostringstream.

Browse source 
To be continued.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5104 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2012-04-15 14:37:44 +00:00
parent 83bd45caa4
commit 470951d664
10 changed files with 136 additions and 191 deletions
libretroshare/src/distrib
p3distrib.cc

35
libretroshare/src/distrib/p3distrib.cc
View file

@ -35,7 +35,6 @@
#include <openssl/evp.h>
#include <openssl/rand.h>
#include <algorithm>
#include <sstream>
#include <fstream>
#include "retroshare/rsdistrib.h"
@ -1130,10 +1129,9 @@ void p3GroupDistrib::locked_publishPendingMsgs()
/* create filename */
std::string path = CacheSource::getCacheDir();
std::ostringstream out;
out << "grpdist-t" << CacheSource::getCacheType() << "-msgs-" << time(NULL) << ".dist";
std::string tmpname = out.str();
std::string tmpname;
rs_sprintf(tmpname, "grpdist-t%u-msgs-%ld.dist", CacheSource::getCacheType(), time(NULL));
std::string filename = path + "/" + tmpname ;
std::string filenametmp = path + "/" + tmpname + ".tmp";
@ -1183,14 +1181,14 @@ void p3GroupDistrib::locked_publishPendingMsgs()
if(!RsDirUtil::renameFile(filenametmp,filename))
{
std::ostringstream errlog;
std::string errlog;
ok &= false;
#ifdef WIN32
errlog << "Error " << GetLastError() ;
rs_sprintf(errlog, "Error %u", GetLastError());
#else
errlog << "Error " << errno ;
rs_sprintf(errlog, "Error %d", errno);
#endif
getPqiNotify()->AddSysMessage(0, RS_SYS_WARNING, "File rename error", "Error while renaming file " + filename + ": got error "+errlog.str());
getPqiNotify()->AddSysMessage(0, RS_SYS_WARNING, "File rename error", "Error while renaming file " + filename + ": got error " + errlog);
}
/* indicate not to save for a while */
@ -1230,10 +1228,9 @@ void p3GroupDistrib::publishDistribGroups()
/* create filename */
std::string path = CacheSource::getCacheDir();
std::ostringstream out;
out << "grpdist-t" << CacheSource::getCacheType() << "-grps-" << time(NULL) << ".dist";
std::string tmpname = out.str();
std::string tmpname;
rs_sprintf(tmpname, "grpdist-t%u-grps-%ld.dist", CacheSource::getCacheType(), time(NULL));
std::string filename = path + "/" + tmpname;
std::string filenametmp = path + "/" + tmpname + ".tmp";
std::string tempPeerId; // to store actual id temporarily
@ -1333,13 +1330,13 @@ void p3GroupDistrib::publishDistribGroups()
if(!RsDirUtil::renameFile(filenametmp,filename))
{
std::ostringstream errlog;
std::string errlog;
#ifdef WIN32
errlog << "Error " << GetLastError() ;
rs_sprintf(errlog, "Error %u", GetLastError());
#else
errlog << "Error " << errno ;
rs_sprintf(errlog, "Error %d", errno);
#endif
getPqiNotify()->AddSysMessage(0, RS_SYS_WARNING, "File rename error", "Error while renaming file " + filename + ": got error "+errlog.str());
getPqiNotify()->AddSysMessage(0, RS_SYS_WARNING, "File rename error", "Error while renaming file " + filename + ": got error " + errlog);
}
/* push file to CacheSource */
@ -2155,13 +2152,13 @@ bool p3GroupDistrib::backUpKeys(const std::list<RsDistribGrpKey* >& keysToBackUp
if(!RsDirUtil::renameFile(filenametmp,filename))
{
std::ostringstream errlog;
std::string errlog;
#ifdef WIN32
errlog << "Error " << GetLastError() ;
rs_sprintf(errlog, "Error %u", GetLastError());
#else
errlog << "Error " << errno ;
rs_sprintf(errlog, "Error %d", errno);
#endif
getPqiNotify()->AddSysMessage(0, RS_SYS_WARNING, "File rename error", "Error while renaming file " + filename + ": got error "+errlog.str());
getPqiNotify()->AddSysMessage(0, RS_SYS_WARNING, "File rename error", "Error while renaming file " + filename + ": got error " + errlog);
return false;
}