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

Remove a bunch of deadcode

Browse source 
RsSerializable already provide std::ostream &operator<<
Add deprecation notice for RsNotify
This commit is contained in:
Gioacchino Mazzurco 2019-04-23 15:46:39 +02:00
parent b1285a5de7
commit de0dd63e3f
No known key found for this signature in database
GPG key ID: A1FBCA3872E87051
17 changed files with 27 additions and 378 deletions
Download patch file Download diff file Expand all files Collapse all files

58
libretroshare/src/rsserver/p3peers.cc
View file

@ -1486,63 +1486,9 @@ RsPeerDetails::RsPeerDetails()
lastConnect(0),lastUsed(0),connectState(0),connectStateString(""),
connectPeriod(0),
foundDHT(false), wasDeniedConnection(false), deniedTS(0),
linkType ( RS_NET_CONN_TRANS_TCP_UNKNOWN)
{
}
linkType ( RS_NET_CONN_TRANS_TCP_UNKNOWN) {}
std::ostream &operator<<(std::ostream &out, const RsPeerDetails &detail)
{
out << "RsPeerDetail: " << detail.name << " <" << detail.id << ">";
out << std::endl;
out << " email: " << detail.email;
out << " location:" << detail.location;
out << " org: " << detail.org;
out << std::endl;
out << " fpr: " << detail.fpr;
out << " authcode:" << detail.authcode;
out << std::endl;
out << " signers:";
out << std::endl;
std::list<RsPgpId>::const_iterator it;
for(it = detail.gpgSigners.begin();
it != detail.gpgSigners.end(); ++it)
{
out << "\t" << *it;
out << std::endl;
}
out << std::endl;
out << " trustLvl: " << detail.trustLvl;
out << " ownSign: " << detail.ownsign;
out << std::endl;
out << " state: " << detail.state;
out << " netMode: " << detail.netMode;
out << std::endl;
out << " localAddr: " << detail.localAddr;
out << ":" << detail.localPort;
out << std::endl;
out << " extAddr: " << detail.extAddr;
out << ":" << detail.extPort;
out << std::endl;
out << " lastConnect: " << detail.lastConnect;
out << " connectPeriod: " << detail.connectPeriod;
out << std::endl;
return out;
}
RsGroupInfo::RsGroupInfo()
{
flag = 0;
}
RsGroupInfo::RsGroupInfo() : flag(0) {}
ServicePermissionFlags p3Peers::servicePermissionFlags(const RsPeerId& ssl_id)
{

72
libretroshare/src/rsserver/rstypes.cc
View file

@ -1,72 +0,0 @@
/*******************************************************************************
* libretroshare/src/rsserver: rstypes.cc *
* *
* libretroshare: retroshare core library *
* *
* Copyright 2004-2006 by Robert Fernie <retroshare.project@gmail.com> *
* *
* This program is free software: you can redistribute it and/or modify *
* it under the terms of the GNU Lesser General Public License as *
* published by the Free Software Foundation, either version 3 of the *
* License, or (at your option) any later version. *
* *
* This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU Lesser General Public License for more details. *
* *
* You should have received a copy of the GNU Lesser General Public License *
* along with this program. If not, see <https://www.gnu.org/licenses/>. *
* *
*******************************************************************************/
/* Insides of RetroShare interface.
* only prints stuff out at the moment
*/
#include "retroshare/rstypes.h"
#include <iostream>
#include <iomanip>
#include "util/rstime.h"
/**********************************************************************
* NOTE NOTE NOTE ...... XXX
* BUG in MinGW .... %hhx in sscanf overwrites 32bits, instead of 8bits.
* this means that scanf(.... &(data[15])) is running off the
* end of the buffer, and hitting data[15-18]...
* To work around this bug we are reading into proper int32s
* and then copying the data over...
*
**********************************************************************/
std::ostream &operator<<(std::ostream &out, const DirDetails& d)
{
std::cerr << "====DIR DETAILS====" << std::endl;
std::cerr << " parent pointer: " << d.parent << std::endl;
std::cerr << " current pointer: " << d.ref << std::endl;
std::cerr << " parent row : " << d.prow << std::endl;
std::cerr << " type : " << (int)d.type << std::endl;
std::cerr << " PeerId : " << d.id << std::endl;
std::cerr << " Name : " << d.name << std::endl;
std::cerr << " Hash : " << d.hash << std::endl;
std::cerr << " Path : " << d.path << std::endl;
std::cerr << " Count : " << d.count << std::endl;
std::cerr << " Age : " << time(NULL) - (int)d.mtime << std::endl;
std::cerr << " Min age : " << time(NULL) - (int)d.max_mtime << std::endl;
std::cerr << " Flags : " << d.flags << std::endl;
std::cerr << " Parent groups : " ; for(std::list<RsNodeGroupId>::const_iterator it(d.parent_groups.begin());it!=d.parent_groups.end();++it) std::cerr << (*it) << " "; std::cerr << std::endl;
std::cerr << " Children : " ; for(uint32_t i=0;i<d.children.size();++i) std::cerr << (void*)(intptr_t)d.children[i].ref << " "; std::cerr << std::endl;
std::cerr << "===================" << std::endl;
return out;
}
std::ostream &operator<<(std::ostream &out, const FileInfo &info)
{
out << "FileInfo: path: " << info.path;
out << std::endl;
out << "File: " << info.fname;
out << " Size: " << info.size;
out << std::endl;
out << "Hash: " << info.hash;
return out;
}