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

further log cleanings

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2235 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
joss17 2010-02-07 23:01:46 +00:00
parent a433eb6abd
commit 5aff139382
5 changed files with 86 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -361,16 +361,12 @@ bool AuthGPG::storeAllKeys_locked()
nu.fpr = mainsubkey->fpr;
#ifdef GPG_DEBUG
std::cerr << "MAIN KEYID: " << nu.id;
std::cerr << " FPR: " << nu.fpr;
std::cerr << std::endl;
std::cerr << "MAIN KEYID: " << nu.id << " FPR: " << nu.fpr << std::endl;
gpgme_subkey_t subkeylist = KEY->subkeys;
while(subkeylist != NULL)
{
std::cerr << "\tKEYID: " << subkeylist->keyid;
std::cerr << " FPR: " << subkeylist->fpr;
std::cerr << std::endl;
std::cerr << "\tKEYID: " << subkeylist->keyid << " FPR: " << subkeylist->fpr << std::endl;
subkeylist = subkeylist->next;
}
@ -646,22 +642,19 @@ bool AuthGPG::DoOwnSignature_locked(const void *data, unsigned int datalen, void
gpgme_signers_clear(CTX);
if (GPG_ERR_NO_ERROR != gpgme_signers_add(CTX, mOwnGpgCert.key))
{
std::cerr << "AuthGPG::DoOwnSignature() Error Adding Signer";
std::cerr << std::endl;
std::cerr << "AuthGPG::DoOwnSignature() Error Adding Signer" << std::endl;
}
gpgme_data_t gpgmeData;
gpgme_data_t gpgmeSig;
if (GPG_ERR_NO_ERROR != gpgme_data_new_from_mem(&gpgmeData, (const char *) data, datalen, 1))
{
std::cerr << "Error create Data";
std::cerr << std::endl;
std::cerr << "Error create Data" << std::endl;
}
if (GPG_ERR_NO_ERROR != gpgme_data_new(&gpgmeSig))
{
std::cerr << "Error create Sig";
std::cerr << std::endl;
std::cerr << "Error create Sig" << std::endl;
}
/* move string data to gpgmeData */
@ -1110,22 +1103,18 @@ std::string AuthGPG::SaveCertificateToString(std::string id)
if (GPG_ERR_NO_ERROR != gpgme_data_new (&gpgmeData))
{
std::cerr << "Error create Data";
std::cerr << std::endl;
std::cerr << "Error create Data" << std::endl;
}
gpgme_set_armor (CTX, 1);
if (GPG_ERR_NO_ERROR != gpgme_op_export_ext (CTX, pattern, 0, gpgmeData))
{
std::cerr << "Error export Data";
std::cerr << std::endl;
std::cerr << "Error export Data" << std::endl;
}
gpgme_data_write (gpgmeData, "", 1); // to be able to convert it into a string
fflush (NULL);
fputs ("Begin Result:\n", stdout);
showData (gpgmeData);
fputs ("End Result.\n", stdout);
showData (gpgmeData);
size_t len = 0;
char *export_txt = gpgme_data_release_and_get_mem(gpgmeData, &len);

7
libretroshare/src/pqi/p3cfgmgr.cc
View file

@ -504,7 +504,9 @@ bool p3Config::saveConfiguration()
if(!written)
return false ;
std::cerr << "renaming " << fnametmp.c_str() << " to " << fname.c_str() << std::endl ;
#ifdef CONFIG_DEBUG
std::cerr << "renaming " << fnametmp.c_str() << " to " << fname.c_str() << std::endl;
#endif
if(!RsDirUtil::renameFile(fnametmp,fname))
{
@ -517,8 +519,9 @@ bool p3Config::saveConfiguration()
getPqiNotify()->AddSysMessage(0, RS_SYS_WARNING, "File rename error", "Error while renaming file " + fname + ": got error "+errlog.str());
return false ;
}
#ifdef CONFIG_DEBUG
std::cerr << "Successfully wrote p3config file " << fname.c_str() << std::endl ;
#endif
/* else okay */
return true;
}

4
libretroshare/src/serialiser/rsdiscitems.cc
View file

@ -37,8 +37,6 @@
#define RSSERIAL_DEBUG 1
***/
#define RSSERIAL_DEBUG 1
#include <iostream>
/*************************************************************************/
@ -618,7 +616,7 @@ bool RsDiscSerialiser::serialiseHeartbeat(RsDiscHeartbeat *item, void *data, uin
ok &= setRsItemHeader(data, *pktsize, item->PacketId(), *pktsize);
#ifdef RSSERIAL_DEBUG
std::cerr << "RsDiscSerialiser::serialiseHeartbeat() Header: " << ok << std::endl;
std::cerr << "RsDiscSerialiser::serialiseHeartbeat() Header: " << ok << std::endl;
std::cerr << "RsDiscSerialiser::serialiseHeartbeat() Size: " << tlvsize << std::endl;
#endif

2
libretroshare/src/turtle/p3turtle.cc
View file

@ -247,7 +247,9 @@ void p3turtle::autoWash()
if(it == _incoming_file_hashes.end())
{
#ifdef P3TURTLE_DEBUG
std::cerr << "p3turtle: asked to stop monitoring file hash " << _hashes_to_remove[i] << ", but this hash is actually not handled by the turtle router." << std::endl ;
#endif
continue ;
}