Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-02 14:16:16 -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@5109 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2012-04-18 21:20:37 +00:00
parent 9aee68a2a9
commit b71eeadf95
9 changed files with 1865 additions and 1925 deletions
Download patch file Download diff file Expand all files Collapse all files

42
libretroshare/src/pqi/authgpg.cc
View file

@ -907,17 +907,17 @@ std::string ProcessPGPmeError(gpgme_error_t ERR)
gpgme_err_code_t code = gpgme_err_code(ERR);
gpgme_err_source_t src = gpgme_err_source(ERR);
std::ostringstream ss ;
std::string s ;
if(code > 0)
{
ss << "GPGme ERROR: Code: " << code << " Source: " << src << std::endl;
ss << "GPGme ERROR: " << gpgme_strerror(ERR) << std::endl;
rs_sprintf(s, "GPGme ERROR: Code: %d Source: %d\n", code, src);
rs_sprintf_append(s, "GPGme ERROR: %s\n", gpgme_strerror(ERR));
}
else
return std::string("Unknown error") ;
return ss.str() ;
return s ;
}
void print_pgpme_verify_summary(unsigned int summary)
@ -1844,9 +1844,8 @@ int AuthGPGimpl::privateTrustCertificate(const std::string &id, int trustlvl)
gpgme_key_t trustKey = trustCert.key;
std::string trustString;
std::ostringstream trustStrOut;
trustStrOut << trustlvl;
class TrustParams sparams(trustStrOut.str());
rs_sprintf(trustString, "%d", trustlvl);
class TrustParams sparams(trustString);
class EditParams params(TRUST_START, &sparams);
gpgme_data_t out;
gpg_error_t ERR;
@ -1875,11 +1874,10 @@ static std::string setKeyPairParams(bool useRsa, unsigned int blen,
std::string name, std::string comment, std::string email,
std::string inPassphrase)
{
std::ostringstream params;
params << "<GnupgKeyParms format=\"internal\">"<< std::endl;
std::string params = "<GnupgKeyParms format=\"internal\">\n";
if (useRsa)
{
params << "Key-Type: RSA"<< std::endl;
params += "Key-Type: RSA\n";
if (blen < 1024)
{
#ifdef GPG_DEBUG
@ -1888,23 +1886,23 @@ static std::string setKeyPairParams(bool useRsa, unsigned int blen,
blen = 1024;
}
blen = ((blen / 512) * 512); /* make multiple of 512 */
params << "Key-Length: "<< blen << std::endl;
rs_sprintf_append(params, "Key-Length: %u\n", blen);
}
else
{
params << "Key-Type: DSA"<< std::endl;
params << "Key-Length: 1024"<< std::endl;
params << "Subkey-Type: ELG-E"<< std::endl;
params << "Subkey-Length: 1024"<< std::endl;
params += "Key-Type: DSA\n";
params += "Key-Length: 1024\n";
params += "Subkey-Type: ELG-E\n";
params += "Subkey-Length: 1024\n";
}
params << "Name-Real: "<< name << std::endl;
params << "Name-Comment: "<< comment << std::endl;
params << "Name-Email: "<< email << std::endl;
params << "Expire-Date: 0"<< std::endl;
params << "Passphrase: "<< inPassphrase << std::endl;
params << "</GnupgKeyParms>"<< std::endl;
params += "Name-Real: " + name + "\n";
params += "Name-Comment: " + comment + "\n";
params += "Name-Email: " + email + "\n";
params += "Expire-Date: 0\n";
params += "Passphrase: " + inPassphrase + "\n";
params += "</GnupgKeyParms>\n";
return params.str();
return params;
}