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

removed unused variable warnings

Browse Source
This commit is contained in:
sehraf 2016-06-21 14:02:52 +02:00
parent 4d2d825d5b
commit 5d962682e1
4 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libretroshare/src/dht/p3bitdht_interface.cc
View File

@ -149,10 +149,10 @@ int p3BitDht::getNetFailedPeer(std::string peerId, PeerStatus &status)
std::string p3BitDht::getUdpAddressString() std::string p3BitDht::getUdpAddressString()
{ {
std::string out; std::string out;
#ifdef RS_USE_DHT_STUNNER
struct sockaddr_in extAddr; struct sockaddr_in extAddr;
uint8_t extStable; uint8_t extStable;
#ifdef RS_USE_DHT_STUNNER
if (mDhtStunner->externalAddr(extAddr, extStable)) if (mDhtStunner->externalAddr(extAddr, extStable))
{ {
rs_sprintf_append(out, " DhtExtAddr: %s:%u", rs_inet_ntoa(extAddr.sin_addr).c_str(), ntohs(extAddr.sin_port)); rs_sprintf_append(out, " DhtExtAddr: %s:%u", rs_inet_ntoa(extAddr.sin_addr).c_str(), ntohs(extAddr.sin_port));

11
libretroshare/src/dht/p3bitdht_peernet.cc
View File

@ -686,7 +686,6 @@ int p3BitDht::ConnectCallback(const bdId *srcId, const bdId *proxyId, const bdId
#endif #endif
struct sockaddr_in extaddr; struct sockaddr_in extaddr;
uint8_t extStable = 0;
sockaddr_clear(&extaddr); sockaddr_clear(&extaddr);
bool connectOk = false; bool connectOk = false;
@ -735,6 +734,8 @@ int p3BitDht::ConnectCallback(const bdId *srcId, const bdId *proxyId, const bdId
} }
#ifdef RS_USE_DHT_STUNNER #ifdef RS_USE_DHT_STUNNER
uint8_t extStable = 0;
UdpStunner *stunner = mProxyStunner; UdpStunner *stunner = mProxyStunner;
if (!proxyPort) if (!proxyPort)
{ {
@ -855,6 +856,8 @@ int p3BitDht::ConnectCallback(const bdId *srcId, const bdId *proxyId, const bdId
} }
#else // RS_USE_DHT_STUNNER #else // RS_USE_DHT_STUNNER
connectionAllowed = BITDHT_CONNECT_ERROR_TEMPUNAVAIL; connectionAllowed = BITDHT_CONNECT_ERROR_TEMPUNAVAIL;
(void) connectOk;
(void) exclusivePort;
#endif // RS_USE_DHT_STUNNER #endif // RS_USE_DHT_STUNNER
} }
@ -1195,7 +1198,6 @@ int p3BitDht::doActions()
else if (action.mMode == BITDHT_CONNECT_MODE_PROXY) else if (action.mMode == BITDHT_CONNECT_MODE_PROXY)
{ {
struct sockaddr_in extaddr; struct sockaddr_in extaddr;
uint8_t extStable = 0;
sockaddr_clear(&extaddr); sockaddr_clear(&extaddr);
bool proxyPort = true; bool proxyPort = true;
bool exclusivePort = false; bool exclusivePort = false;
@ -1242,6 +1244,8 @@ int p3BitDht::doActions()
} }
} }
#ifdef RS_USE_DHT_STUNNER #ifdef RS_USE_DHT_STUNNER
uint8_t extStable = 0;
UdpStunner *stunner = mProxyStunner; UdpStunner *stunner = mProxyStunner;
if (!proxyPort) if (!proxyPort)
{ {
@ -1344,6 +1348,7 @@ int p3BitDht::doActions()
#else // RS_USE_DHT_STUNNER #else // RS_USE_DHT_STUNNER
connectionReqFailed = true; connectionReqFailed = true;
failReason = CSB_UPDATE_RETRY_ATTEMPT; failReason = CSB_UPDATE_RETRY_ATTEMPT;
(void) connectOk;
#endif //RS_USE_DHT_STUNNER #endif //RS_USE_DHT_STUNNER
} }
@ -2404,6 +2409,8 @@ void p3BitDht::ReleaseProxyExclusiveMode_locked(DhtPeerDetails *dpd, bool addrCh
#endif #endif
} }
else else
#else // RS_USE_DHT_STUNNER
(void)addrChgLikely;
#endif // RS_USE_DHT_STUNNER #endif // RS_USE_DHT_STUNNER
{ {
dpd->mExclusiveProxyLock = false; dpd->mExclusiveProxyLock = false;

4
libretroshare/src/pqi/p3netmgr.cc
View File

@ -1736,12 +1736,12 @@ void p3NetMgrIMPL::updateNetStateBox_temporal()
std::cerr << "p3NetMgrIMPL::updateNetStateBox_temporal() "; std::cerr << "p3NetMgrIMPL::updateNetStateBox_temporal() ";
std::cerr << std::endl; std::cerr << std::endl;
#endif #endif
uint8_t isstable = 0;
struct sockaddr_storage tmpaddr; struct sockaddr_storage tmpaddr;
sockaddr_storage_clear(tmpaddr); sockaddr_storage_clear(tmpaddr);
#ifdef RS_USE_DHT_STUNNER #ifdef RS_USE_DHT_STUNNER
uint8_t isstable = 0;
if (mDhtStunner) if (mDhtStunner)
{ {

3
libretroshare/src/services/p3idservice.cc
View File

@ -395,9 +395,6 @@ void p3IdService::cleanUnusedKeys()
} }
// grab at most 10 identities to delete. No need to send too many requests to the token queue at once. // grab at most 10 identities to delete. No need to send too many requests to the token queue at once.
time_t now = time(NULL) ;
int n=0 ;
IdCacheEntryCleaner idcec(mKeysTS) ; IdCacheEntryCleaner idcec(mKeysTS) ;
mKeyCache.applyToAllCachedEntries(idcec,&IdCacheEntryCleaner::processEntry); mKeyCache.applyToAllCachedEntries(idcec,&IdCacheEntryCleaner::processEntry);