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

Removed unused parameter warnings in libbitdht.

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4557 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2011-08-12 12:43:24 +00:00
parent babbea6599
commit 27842b8592
7 changed files with 34 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
libbitdht/src/bitdht/bdconnection.cc
View File

@ -212,6 +212,10 @@ int bdConnectManager::checkExistingConnectionAttempt(bdNodeId *target)
int bdConnectManager::killConnectionRequest(struct sockaddr_in *laddr, bdNodeId *target, uint32_t mode)
{
/* remove unused parameter warnings */
(void) laddr;
(void) mode;
/* check if connection obj already exists */
#ifdef DEBUG_NODE_CONNECTION
std::cerr << "bdConnectManager::killConnectionRequest() Mode: " << mode;
@ -266,7 +270,6 @@ int bdConnectManager::requestConnection_direct(struct sockaddr_in *laddr, bdNode
std::cerr << std::endl;
#endif
/* create a bdConnect, and put into the queue */
int mode = BITDHT_CONNECT_MODE_DIRECT;
bdConnectionRequest connreq;
if (checkExistingConnectionAttempt(target))
@ -830,7 +833,6 @@ int bdConnectManager::startConnectionAttempt(bdConnectionRequest *req)
req->mState = BITDHT_CONNREQUEST_INPROGRESS;
req->mStateTS = time(NULL);
bool failProxy = false;
if (mode == BITDHT_CONNECT_MODE_DIRECT)
{
// ONE BUG I HAVE SEEN.
@ -1191,7 +1193,6 @@ void bdConnectManager::callbackConnectRequest(bdId *srcId, bdId *proxyId, bdId *
} // end of error code switch.
// Now act on the decision.
int newerrcode = errcode;
if (fatal)
{
/* kill connection request, do callback */
@ -1818,7 +1819,7 @@ int bdConnectManager::cleanConnection(bdNodeId *srcId, bdNodeId *proxyId, bdNode
}
int bdConnectManager::determinePosition(bdNodeId *sender, bdNodeId *src, bdNodeId *dest)
int bdConnectManager::determinePosition(bdNodeId */*sender*/, bdNodeId *src, bdNodeId *dest)
{
int pos = BD_PROXY_CONNECTION_UNKNOWN_POINT;
if (mOwnId == *src)
@ -1924,7 +1925,6 @@ int bdConnectManager::recvedConnectionRequest(bdId *id, bdId *srcConnAddr, bdId
int pos = determinePosition(&(id->id), &(srcConnAddr->id), &(destConnAddr->id));
uint32_t status = createConnectionErrorCode(0, BITDHT_CONNECT_ERROR_UNSUPPORTED, pos);
int param = 0;
int msgtype = BITDHT_MSG_TYPE_CONNECT_REPLY;
mPub->send_connect_msg(id, msgtype, srcConnAddr, destConnAddr, mode, 0, status);
@ -2383,7 +2383,7 @@ int bdConnectManager::recvedConnectionStart(bdId *id, bdId *srcConnAddr, bdId *d
* Acks are set, and connections completed if possible (including callback!).
*/
int bdConnectManager::recvedConnectionAck(bdId *id, bdId *srcConnAddr, bdId *destConnAddr, int mode)
int bdConnectManager::recvedConnectionAck(bdId *id, bdId *srcConnAddr, bdId *destConnAddr, int /*mode*/)
{
/* retrieve existing connection data */
bdConnection *conn = findExistingConnectionBySender(id, srcConnAddr, destConnAddr);
@ -2446,7 +2446,7 @@ int bdConnectManager::recvedConnectionAck(bdId *id, bdId *srcConnAddr, bdId *des
/* connection complete! cleanup */
if (conn->mMode == BITDHT_CONNECT_MODE_DIRECT)
{
int mode = conn->mMode | BITDHT_CONNECT_ANSWER_OKAY;
// int mode = conn->mMode | BITDHT_CONNECT_ANSWER_OKAY;
/* callback to connect to Src address! */
// Slightly different callback, use ConnAddr for start message!
// Also callback to ConnectionRequest first.
@ -2645,7 +2645,7 @@ int bdConnection::ConnectionRequestEnd(bdId *id, bdId *srcId, bdId *destId, int
// Received AUTH, step up to next stage.
// Search for dest ID/IP is done before AUTH. so actually nothing to do here, except set the state
int bdConnection::AuthoriseProxyConnection(bdId *srcId, bdId *proxyId, bdId *destId, int mode, int loc, int bandwidth)
int bdConnection::AuthoriseProxyConnection(bdId */*srcId*/, bdId */*proxyId*/, bdId */*destId*/, int /*mode*/, int /*loc*/, int bandwidth)
{
mState = BITDHT_CONNECTION_WAITING_REPLY;
mLastEvent = time(NULL);
@ -2679,7 +2679,7 @@ int bdConnection::AuthoriseProxyConnection(bdId *srcId, bdId *proxyId, bdId *des
/* we are end of a Proxy Connection */
int bdConnection::AuthoriseEndConnection(bdId *srcId, bdId *proxyId, bdId *destConnAddr, int mode, int loc, int delay)
int bdConnection::AuthoriseEndConnection(bdId */*srcId*/, bdId */*proxyId*/, bdId *destConnAddr, int /*mode*/, int /*loc*/, int delay)
{
mState = BITDHT_CONNECTION_WAITING_START;
mLastEvent = time(NULL);
@ -2725,7 +2725,7 @@ int bdConnection::AuthoriseEndConnection(bdId *srcId, bdId *proxyId, bdId *destC
// Auth of the Direct Connection, means we move straight to WAITING_ACK mode.
int bdConnection::AuthoriseDirectConnection(bdId *srcId, bdId *proxyId, bdId *destConnAddr, int mode, int loc)
int bdConnection::AuthoriseDirectConnection(bdId */*srcId*/, bdId */*proxyId*/, bdId *destConnAddr, int /*mode*/, int /*loc*/)
{
mState = BITDHT_CONNECTION_WAITING_ACK;
mLastEvent = time(NULL);
@ -2761,7 +2761,7 @@ int bdConnection::AuthoriseDirectConnection(bdId *srcId, bdId *proxyId, bdId *de
}
// Proxy Connection => at Proxy, Ready to send out Start and get back ACKs!!
int bdConnection::upgradeProxyConnectionToFinish(bdId *id, bdId *srcConnAddr, bdId *destConnAddr, int mode, int secondDelay, int status)
int bdConnection::upgradeProxyConnectionToFinish(bdId */*id*/, bdId */*srcConnAddr*/, bdId *destConnAddr, int /*mode*/, int secondDelay, int /*status*/)
{
mState = BITDHT_CONNECTION_WAITING_ACK;
mLastEvent = time(NULL);
@ -2820,7 +2820,7 @@ int bdConnection::upgradeProxyConnectionToFinish(bdId *id, bdId *srcConnAddr, bd
// Final Sorting out of Addresses.
// This is called at the Connection Ends, on receiving the START message.
// This will contain either Bandwidth or Delay.
int bdConnection::CompleteConnection(bdId *id, bdId *srcConnAddr, bdId *destConnAddr, int bandwidth, int delay)
int bdConnection::CompleteConnection(bdId */*id*/, bdId *srcConnAddr, bdId *destConnAddr, int bandwidth, int delay)
{
/* Store Final Addresses */
time_t now = time(NULL);

1
libbitdht/src/bitdht/bdfilter.cc
View File

@ -44,7 +44,6 @@ bdFilter::bdFilter(const bdNodeId *ownId, std::list<bdFilteredPeer> &startList,
mOwnId = *ownId;
mFns = fns;
time_t now = time(NULL);
std::list<bdFilteredPeer>::iterator it;
for(it = startList.begin(); it != startList.end(); it++)

17
libbitdht/src/bitdht/bdmanager.cc
View File

@ -1260,6 +1260,9 @@ bdDebugCallback::~bdDebugCallback()
int bdDebugCallback::dhtPeerCallback(const bdId *id, uint32_t status)
{
/* remove unused parameter warnings */
(void) status;
#ifdef DEBUG_MGR
std::cerr << "bdDebugCallback::dhtPeerCallback() Id: ";
#endif
@ -1272,6 +1275,10 @@ int bdDebugCallback::dhtPeerCallback(const bdId *id, uint32_t status)
int bdDebugCallback::dhtValueCallback(const bdNodeId *id, std::string key, uint32_t status)
{
/* remove unused parameter warnings */
(void) key;
(void) status;
#ifdef DEBUG_MGR
std::cerr << "bdDebugCallback::dhtValueCallback() Id: ";
#endif
@ -1343,6 +1350,16 @@ void bdNodeManager::callbackConnect(bdId *srcId, bdId *proxyId, bdId *destId, in
int bdDebugCallback::dhtConnectCallback(const bdId *srcId, const bdId *proxyId, const bdId *destId,
uint32_t mode, uint32_t point, uint32_t param, uint32_t cbtype, uint32_t errcode)
{
/* remove unused parameter warnings */
(void) srcId;
(void) proxyId;
(void) destId;
(void) mode;
(void) point;
(void) param;
(void) cbtype;
(void) errcode;
#ifdef DEBUG_MGR
std::cerr << "bdDebugCallback::dhtConnectCallback() Type: " << cbtype;
std::cerr << " errCode: " << errcode;

11
libbitdht/src/bitdht/bdnode.cc
View File

@ -66,8 +66,7 @@
bdNode::bdNode(bdNodeId *ownId, std::string dhtVersion, std::string bootfile, bdDhtFunctions *fns)
:mOwnId(*ownId), mNodeSpace(ownId, fns), mStore(bootfile, fns), mDhtVersion(dhtVersion), mFns(fns),
mQueryMgr(NULL), mConnMgr(NULL), mFilterPeers(NULL)
:mNodeSpace(ownId, fns), mQueryMgr(NULL), mConnMgr(NULL), mFilterPeers(NULL), mOwnId(*ownId), mDhtVersion(dhtVersion), mStore(bootfile, fns), mFns(fns)
{
init(); /* (uses this pointers) stuff it - do it here! */
@ -194,12 +193,6 @@ void bdNode::iteration()
mFns->bdPrintNodeId(std::cerr, &mOwnId);
std::cerr << std::endl;
#endif
/* iterate through queries */
bdId id;
bdNodeId targetNodeId;
std::list<bdQuery>::iterator it;
std::list<bdId>::iterator bit;
/* process incoming msgs */
while(mIncomingMsgs.size() > 0)
@ -418,7 +411,7 @@ void bdNode::checkPotentialPeer(bdId *id, bdId *src)
}
void bdNode::addPotentialPeer(bdId *id, bdId *src)
void bdNode::addPotentialPeer(bdId *id, bdId */*src*/)
{
mPotentialPeers.push_back(*id);
}

2
libbitdht/src/bitdht/bdpeer.cc
View File

@ -412,7 +412,6 @@ int bdSpace::find_exactnode(const bdId *id, bdPeer &peer)
bdBucket &buck = buckets[buckno];
std::list<bdPeer>::iterator eit;
int matchCount = 0;
for(eit = buck.entries.begin(); eit != buck.entries.end(); eit++)
{
if (*id == eit->mPeerId)
@ -576,7 +575,6 @@ int bdSpace::updateAttachedPeers()
/* start from the back, as these are the most recently seen (and more likely to be the old ATTACHED) */
for(eit = it->entries.rbegin(); eit != it->entries.rend(); eit++)
{
bool added = false;
if (doAttached)
{
if ((eit->mPeerFlags & mAttachedFlags) == mAttachedFlags)

1
libbitdht/src/bitdht/bdquery.cc
View File

@ -504,7 +504,6 @@ int bdQuery::worthyPotentialPeer(const bdId *id)
* if it is already in mClosest -> false. old peer.
* if it is > mClosest.rbegin() -> false. too far way.
*/
int retval = 1;
std::multimap<bdMetric, bdPeer>::iterator it, sit, eit;
sit = mClosest.lower_bound(dist);

3
libbitdht/src/util/bdthreads.h
View File

@ -39,6 +39,9 @@ class bdMutex
bdMutex(bool recursive = false)
{
/* remove unused parameter warnings */
(void) recursive;
#if 0 // TESTING WITHOUT RECURSIVE
if(recursive)
{