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

Removed some unused parameter warnings.

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8481 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2015-06-15 22:41:18 +00:00
parent ec6f6ea009
commit 0ee754939e
8 changed files with 21 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
libretroshare/src/chat/distantchat.cc
View file

@ -288,6 +288,9 @@ void DistantChatService::removeVirtualPeer(const TurtleFileHash& hash,const Turt
#ifdef DEBUG_DISTANT_CHAT #ifdef DEBUG_DISTANT_CHAT
std::cerr << "Distant chat: Removing virtual peer " << virtual_peer_id << " for hash " << hash << std::endl; std::cerr << "Distant chat: Removing virtual peer " << virtual_peer_id << " for hash " << hash << std::endl;
#else
/* remove unused parameter warnings */
(void) hash;
#endif #endif
{ {
RsStackMutex stack(mDistantChatMtx); /********** STACK LOCKED MTX ******/ RsStackMutex stack(mDistantChatMtx); /********** STACK LOCKED MTX ******/
@ -354,6 +357,9 @@ void DistantChatService::receiveTurtleData(RsTurtleGenericTunnelItem *gitem,cons
std::cerr << " hash = " << hash << std::endl; std::cerr << " hash = " << hash << std::endl;
std::cerr << " vpid = " << virtual_peer_id << std::endl; std::cerr << " vpid = " << virtual_peer_id << std::endl;
std::cerr << " acting as = " << direction << std::endl; std::cerr << " acting as = " << direction << std::endl;
#else
/* remove unused parameter warnings */
(void) direction;
#endif #endif
RsTurtleGenericDataItem *item = dynamic_cast<RsTurtleGenericDataItem*>(gitem) ; RsTurtleGenericDataItem *item = dynamic_cast<RsTurtleGenericDataItem*>(gitem) ;

2
libretroshare/src/chat/p3chatservice.cc
View file

@ -753,7 +753,7 @@ bool p3ChatService::handleRecvChatMsgItem(RsChatMsgItem *ci)
return true ; return true ;
} }
void p3ChatService::locked_storeIncomingMsg(RsChatMsgItem *item) void p3ChatService::locked_storeIncomingMsg(RsChatMsgItem */*item*/)
{ {
#ifdef REMOVE #ifdef REMOVE
privateIncomingList.push_back(item) ; privateIncomingList.push_back(item) ;

4
libretroshare/src/ft/ftextralist.h
View file

@ -70,14 +70,14 @@ class FileDetails
return; return;
} }
FileDetails(std::string path, uint32_t p, TransferRequestFlags f) FileDetails(std::string path, uint32_t /*p*/, TransferRequestFlags f)
{ {
info.path = path; info.path = path;
// period = p; // period = p;
info.transfer_info_flags = f; info.transfer_info_flags = f;
} }
FileDetails(FileInfo &i, uint32_t p, TransferRequestFlags f) FileDetails(FileInfo &i, uint32_t /*p*/, TransferRequestFlags f)
{ {
info = i; info = i;
// period = p; // period = p;

2
libretroshare/src/grouter/grouterclientservice.h
View file

@ -53,7 +53,7 @@ class GRouterClientService
// //
// GRouter stays owner of the item, so the client should not delete it! // GRouter stays owner of the item, so the client should not delete it!
// //
virtual void receiveGRouterData(const RsGxsId& destination_key,const RsGxsId& signing_key, GRouterServiceId &client_id, uint8_t *data, uint32_t data_size) virtual void receiveGRouterData(const RsGxsId& destination_key,const RsGxsId& /*signing_key*/, GRouterServiceId &/*client_id*/, uint8_t */*data*/, uint32_t /*data_size*/)
{ {
std::cerr << "!!!!!! Received Data from global router, but the client service is not handling it !!!!!!!!!!" << std::endl ; std::cerr << "!!!!!! Received Data from global router, but the client service is not handling it !!!!!!!!!!" << std::endl ;
std::cerr << " destination key_id = " << destination_key.toStdString() << std::endl; std::cerr << " destination key_id = " << destination_key.toStdString() << std::endl;

4
libretroshare/src/pqi/authssl.cc
View file

@ -668,7 +668,7 @@ bool AuthSSLimpl::VerifyOwnSignBin(const void *data, const uint32_t len,
* only using GPG functions - which lock themselves * only using GPG functions - which lock themselves
*/ */
X509 *AuthSSLimpl::SignX509ReqWithGPG(X509_REQ *req, long days) X509 *AuthSSLimpl::SignX509ReqWithGPG(X509_REQ *req, long /*days*/)
{ {
/* Transform the X509_REQ into a suitable format to /* Transform the X509_REQ into a suitable format to
* generate DIGEST hash. (for SSL to do grunt work) * generate DIGEST hash. (for SSL to do grunt work)
@ -1109,10 +1109,10 @@ int AuthSSLimpl::VerifyX509Callback(int preverify_ok, X509_STORE_CTX *ctx)
{ {
char buf[256]; char buf[256];
X509 *err_cert; X509 *err_cert;
int err, depth;
err_cert = X509_STORE_CTX_get_current_cert(ctx); err_cert = X509_STORE_CTX_get_current_cert(ctx);
#ifdef AUTHSSL_DEBUG #ifdef AUTHSSL_DEBUG
int err, depth;
err = X509_STORE_CTX_get_error(ctx); err = X509_STORE_CTX_get_error(ctx);
depth = X509_STORE_CTX_get_error_depth(ctx); depth = X509_STORE_CTX_get_error_depth(ctx);
#endif #endif

4
libretroshare/src/pqi/p3peermgr.cc
View file

@ -1248,7 +1248,6 @@ bool p3PeerMgrIMPL::addCandidateForOwnExternalAddress(const RsPeerId &from, cons
sockaddr_storage addr_filtered ; sockaddr_storage addr_filtered ;
sockaddr_storage_copyip(addr_filtered,addr) ; sockaddr_storage_copyip(addr_filtered,addr) ;
time_t now = time(NULL) ;
#ifdef PEER_DEBUG #ifdef PEER_DEBUG
std::cerr << "Own external address is " << sockaddr_storage_iptostring(addr_filtered) << ", as reported by friend " << from << std::endl; std::cerr << "Own external address is " << sockaddr_storage_iptostring(addr_filtered) << ", as reported by friend " << from << std::endl;
@ -1296,6 +1295,9 @@ static bool cleanIpList(std::list<pqiIpAddress>& lst,const RsPeerId& pid,p3LinkM
{ {
#ifdef PEER_DEBUG #ifdef PEER_DEBUG
std::cerr << "Checking IP address " << sockaddr_storage_iptostring( (*it2).mAddr) << " for peer " << pid << ", age = " << now - (*it2).mSeenTime << std::endl; std::cerr << "Checking IP address " << sockaddr_storage_iptostring( (*it2).mAddr) << " for peer " << pid << ", age = " << now - (*it2).mSeenTime << std::endl;
#else
/* remove unused parameter warnings */
(void) pid;
#endif #endif
if(!link_mgr->checkPotentialAddr( (*it2).mAddr,now - (*it2).mSeenTime)) if(!link_mgr->checkPotentialAddr( (*it2).mAddr,now - (*it2).mSeenTime))
{ {

2
libretroshare/src/pqi/pqissl.cc
View file

@ -290,6 +290,8 @@ bool pqissl::connect_parameter(uint32_t type, const std::string &value)
{ {
RsStackMutex stack(mSslMtx); /**** LOCKED MUTEX ****/ RsStackMutex stack(mSslMtx); /**** LOCKED MUTEX ****/
/* remove unused parameter warnings */
(void) type;
(void) value; (void) value;
return false; return false;
} }

5
libretroshare/src/services/p3discovery2.cc
View file

@ -865,6 +865,9 @@ void p3discovery2::processContactInfo(const SSLID &fromId, const RsDiscContactIt
std::cerr << "p3discovery2::processContactInfo(" << fromId << ") PGPID: "; std::cerr << "p3discovery2::processContactInfo(" << fromId << ") PGPID: ";
std::cerr << item->pgpId << " Ignoring Info on self"; std::cerr << item->pgpId << " Ignoring Info on self";
std::cerr << std::endl; std::cerr << std::endl;
#else
/* remove unused parameter warnings */
(void) fromId;
#endif #endif
delete item; delete item;
return; return;
@ -1025,7 +1028,7 @@ void p3discovery2::sendPGPCertificate(const PGPID &aboutId, const SSLID &toId)
} }
void p3discovery2::recvPGPCertificate(const SSLID &fromId, RsDiscPgpCertItem *item) void p3discovery2::recvPGPCertificate(const SSLID &/*fromId*/, RsDiscPgpCertItem *item)
{ {
#ifdef P3DISC_DEBUG #ifdef P3DISC_DEBUG