mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-05-02 14:16:16 -04:00
Removed unused parameter warnings in libretroshare.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4558 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2
parent
27842b8592
commit
c6beee44ec
61 changed files with 1047 additions and 983 deletions
|
|
@ -94,7 +94,7 @@ ftFileControl::ftFileControl(std::string fname,
|
|||
return;
|
||||
}
|
||||
|
||||
ftController::ftController(CacheStrapper *cs, ftDataMultiplex *dm, std::string configDir)
|
||||
ftController::ftController(CacheStrapper *cs, ftDataMultiplex *dm, std::string /*configDir*/)
|
||||
:CacheTransfer(cs), p3Config(CONFIG_TYPE_FT_CONTROL),
|
||||
last_save_time(0),
|
||||
last_clean_time(0),
|
||||
|
|
|
|||
|
|
@ -69,78 +69,78 @@ bool ftDataSendPair::sendCRC32Map(const std::string& peer_id,const std::strin
|
|||
return mDataRecv->recvCRC32Map(peer_id,hash,crcmap) ;
|
||||
}
|
||||
/* Client Send */
|
||||
bool ftDataSendDummy::sendDataRequest(const std::string &peerId, const std::string &hash,
|
||||
uint64_t size, uint64_t offset, uint32_t chunksize)
|
||||
bool ftDataSendDummy::sendDataRequest(const std::string &/*peerId*/, const std::string &/*hash*/,
|
||||
uint64_t /*size*/, uint64_t /*offset*/, uint32_t /*chunksize*/)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
/* Server Send */
|
||||
bool ftDataSendDummy::sendData(const std::string &peerId, const std::string &hash,
|
||||
uint64_t size, uint64_t offset, uint32_t chunksize, void *data)
|
||||
bool ftDataSendDummy::sendData(const std::string &/*peerId*/, const std::string &/*hash*/,
|
||||
uint64_t /*size*/, uint64_t /*offset*/, uint32_t /*chunksize*/, void */*data*/)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
/* Send a request for a chunk map */
|
||||
bool ftDataSendDummy::sendChunkMapRequest(const std::string& peer_id,const std::string& hash,bool is_client)
|
||||
bool ftDataSendDummy::sendChunkMapRequest(const std::string& /*peer_id*/,const std::string& /*hash*/,bool /*is_client*/)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
/* Send a chunk map */
|
||||
bool ftDataSendDummy::sendChunkMap(const std::string& peer_id,const std::string& hash, const CompressedChunkMap& cmap,bool is_client)
|
||||
bool ftDataSendDummy::sendChunkMap(const std::string& /*peer_id*/,const std::string& /*hash*/, const CompressedChunkMap& /*cmap*/,bool /*is_client*/)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
bool ftDataSendDummy::sendCRC32MapRequest(const std::string& peer_id,const std::string& hash)
|
||||
bool ftDataSendDummy::sendCRC32MapRequest(const std::string& /*peer_id*/,const std::string& /*hash*/)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
/* Send a chunk map */
|
||||
bool ftDataSendDummy::sendCRC32Map(const std::string& peer_id,const std::string& hash, const CRC32Map& cmap)
|
||||
bool ftDataSendDummy::sendCRC32Map(const std::string& /*peer_id*/,const std::string& /*hash*/, const CRC32Map& /*cmap*/)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
/* Client Recv */
|
||||
bool ftDataRecvDummy::recvData(const std::string &peerId, const std::string &hash,
|
||||
uint64_t size, uint64_t offset, uint32_t chunksize, void *data)
|
||||
bool ftDataRecvDummy::recvData(const std::string &/*peerId*/, const std::string &/*hash*/,
|
||||
uint64_t /*size*/, uint64_t /*offset*/, uint32_t /*chunksize*/, void */*data*/)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
/* Server Recv */
|
||||
bool ftDataRecvDummy::recvDataRequest(const std::string &peerId, const std::string &hash,
|
||||
uint64_t size, uint64_t offset, uint32_t chunksize)
|
||||
bool ftDataRecvDummy::recvDataRequest(const std::string &/*peerId*/, const std::string &/*hash*/,
|
||||
uint64_t /*size*/, uint64_t /*offset*/, uint32_t /*chunksize*/)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
/* Send a request for a chunk map */
|
||||
bool ftDataRecvDummy::recvChunkMapRequest(const std::string& peer_id,const std::string& hash,
|
||||
bool is_client)
|
||||
bool ftDataRecvDummy::recvChunkMapRequest(const std::string& /*peer_id*/,const std::string& /*hash*/,
|
||||
bool /*is_client*/)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
/* Send a chunk map */
|
||||
bool ftDataRecvDummy::recvChunkMap(const std::string& peer_id,const std::string& hash,
|
||||
const CompressedChunkMap& cmap,bool is_client)
|
||||
bool ftDataRecvDummy::recvChunkMap(const std::string& /*peer_id*/,const std::string& /*hash*/,
|
||||
const CompressedChunkMap& /*cmap*/,bool /*is_client*/)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
bool ftDataRecvDummy::sendCRC32MapRequest(const std::string& peer_id,const std::string& hash)
|
||||
bool ftDataRecvDummy::sendCRC32MapRequest(const std::string& /*peer_id*/,const std::string& /*hash*/)
|
||||
{
|
||||
return true ;
|
||||
}
|
||||
|
||||
/* Send a chunk map */
|
||||
bool ftDataRecvDummy::sendCRC32Map(const std::string& peer_id,const std::string& hash, const CompressedChunkMap& cmap)
|
||||
bool ftDataRecvDummy::sendCRC32Map(const std::string& /*peer_id*/,const std::string& /*hash*/, const CompressedChunkMap& /*cmap*/)
|
||||
{
|
||||
return true ;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -398,7 +398,7 @@ bool ftDataMultiplex::doWork()
|
|||
return true;
|
||||
}
|
||||
|
||||
bool ftDataMultiplex::recvCRC32Map(const std::string& peerId, const std::string& hash,const CRC32Map& crc_map)
|
||||
bool ftDataMultiplex::recvCRC32Map(const std::string& /*peerId*/, const std::string& hash,const CRC32Map& crc_map)
|
||||
{
|
||||
RsStackMutex stack(dataMtx); /******* LOCK MUTEX ******/
|
||||
|
||||
|
|
@ -595,7 +595,7 @@ bool ftDataMultiplex::handleRecvServerChunkMapRequest(const std::string& peerId,
|
|||
}
|
||||
|
||||
bool ftDataMultiplex::handleRecvData(const std::string& peerId,
|
||||
const std::string& hash, uint64_t size,
|
||||
const std::string& hash, uint64_t /*size*/,
|
||||
uint64_t offset, uint32_t chunksize, void *data)
|
||||
{
|
||||
ftTransferModule *transfer_module = NULL ;
|
||||
|
|
|
|||
|
|
@ -46,6 +46,9 @@ bool ftFiStore::search(const std::string &hash, uint32_t hintflags, FileInfo &in
|
|||
* Still to see if concept is worthwhle
|
||||
*/
|
||||
|
||||
/* remove unused parameter warnings */
|
||||
(void) hintflags;
|
||||
|
||||
#ifdef DB_DEBUG
|
||||
std::cerr << "ftFiStore::search(" << hash << "," << hintflags;
|
||||
std::cerr << ")";
|
||||
|
|
@ -375,6 +378,9 @@ ftCacheStrapper::ftCacheStrapper(p3LinkMgr *lm)
|
|||
/* overloaded search function */
|
||||
bool ftCacheStrapper::search(const std::string &hash, uint32_t hintflags, FileInfo &info) const
|
||||
{
|
||||
/* remove unused parameter warnings */
|
||||
(void) hintflags;
|
||||
|
||||
#ifdef DB_DEBUG
|
||||
std::cerr << "ftCacheStrapper::search(" << hash << "," << hintflags;
|
||||
std::cerr << ")";
|
||||
|
|
|
|||
|
|
@ -178,6 +178,9 @@ bool ftExtraList::addExtraFile(std::string path, std::string hash,
|
|||
|
||||
bool ftExtraList::removeExtraFile(std::string hash, uint32_t flags)
|
||||
{
|
||||
/* remove unused parameter warnings */
|
||||
(void) flags;
|
||||
|
||||
#ifdef DEBUG_ELIST
|
||||
std::cerr << "ftExtraList::removeExtraFile()";
|
||||
std::cerr << " hash: " << hash;
|
||||
|
|
@ -202,7 +205,7 @@ bool ftExtraList::removeExtraFile(std::string hash, uint32_t flags)
|
|||
return true;
|
||||
}
|
||||
|
||||
bool ftExtraList::moveExtraFile(std::string fname, std::string hash, uint64_t size,
|
||||
bool ftExtraList::moveExtraFile(std::string fname, std::string hash, uint64_t /*size*/,
|
||||
std::string destpath)
|
||||
{
|
||||
RsStackMutex stack(extMutex);
|
||||
|
|
@ -269,7 +272,7 @@ bool ftExtraList::cleanupOldFiles()
|
|||
}
|
||||
|
||||
|
||||
bool ftExtraList::cleanupEntry(std::string path, uint32_t flags)
|
||||
bool ftExtraList::cleanupEntry(std::string /*path*/, uint32_t flags)
|
||||
{
|
||||
if (flags & RS_FILE_CONFIG_CLEANUP_DELETE)
|
||||
{
|
||||
|
|
@ -329,7 +332,7 @@ bool ftExtraList::hashExtraFileDone(std::string path, FileInfo &info)
|
|||
* Search Function - used by File Transfer
|
||||
*
|
||||
**/
|
||||
bool ftExtraList::search(const std::string &hash, uint32_t hintflags, FileInfo &info) const
|
||||
bool ftExtraList::search(const std::string &hash, uint32_t /*hintflags*/, FileInfo &info) const
|
||||
{
|
||||
|
||||
#ifdef DEBUG_ELIST
|
||||
|
|
|
|||
|
|
@ -117,7 +117,7 @@ class ftFileCreator: public ftFileProvider
|
|||
// This is overloads ftFileProvider, but returns false, because we can't ensure that unchecked chunks
|
||||
// will provide a CRC32 that is faithful to the original hash.
|
||||
//
|
||||
virtual bool getCRC32Map(CRC32Map& crc_map) { return false ; }
|
||||
virtual bool getCRC32Map(CRC32Map& /*crc_map*/) { return false ; }
|
||||
|
||||
// This is called when receiving the availability map from a source peer, for the file being handled.
|
||||
//
|
||||
|
|
|
|||
|
|
@ -180,14 +180,17 @@ bool ftFileSearch::search(const std::string &hash, uint32_t hintflags, FileInfo
|
|||
}
|
||||
|
||||
|
||||
bool ftSearchDummy::search(std::string hash, uint32_t hintflags, FileInfo &info) const
|
||||
bool ftSearchDummy::search(std::string /*hash*/, uint32_t hintflags, FileInfo &/*info*/) const
|
||||
{
|
||||
/* remove unused parameter warnings */
|
||||
(void) hintflags;
|
||||
|
||||
#ifdef DEBUG_SEARCH
|
||||
std::cerr << "ftSearchDummy::search(" << hash ;
|
||||
std::cerr << ", " << hintflags << ");";
|
||||
std::cerr << std::endl;
|
||||
#endif
|
||||
return false;
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -58,8 +58,8 @@ const int ftserverzone = 29539;
|
|||
|
||||
/* Setup */
|
||||
ftServer::ftServer(p3PeerMgr *pm, p3LinkMgr *lm)
|
||||
: mP3iface(NULL),
|
||||
mLinkMgr(lm), mPeerMgr(pm),
|
||||
: mP3iface(NULL), mPeerMgr(pm),
|
||||
mLinkMgr(lm),
|
||||
mCacheStrapper(NULL),
|
||||
mFiStore(NULL), mFiMon(NULL),
|
||||
mFtController(NULL), mFtExtra(NULL),
|
||||
|
|
@ -93,7 +93,7 @@ void ftServer::setP3Interface(P3Interface *pqi)
|
|||
/* Control Interface */
|
||||
|
||||
/* add Config Items (Extra, Controller) */
|
||||
void ftServer::addConfigComponents(p3ConfigMgr *mgr)
|
||||
void ftServer::addConfigComponents(p3ConfigMgr */*mgr*/)
|
||||
{
|
||||
/* NOT SURE ABOUT THIS ONE */
|
||||
}
|
||||
|
|
@ -361,7 +361,7 @@ bool ftServer::getDownloadSpeed(const std::string hash, int & speed)
|
|||
|
||||
return ret;
|
||||
}
|
||||
bool ftServer::clearDownload(const std::string hash)
|
||||
bool ftServer::clearDownload(const std::string /*hash*/)
|
||||
{
|
||||
return true ;
|
||||
}
|
||||
|
|
@ -742,18 +742,18 @@ RsSerialiser *ftServer::setupSerialiser()
|
|||
return NULL;
|
||||
}
|
||||
|
||||
bool ftServer::saveList(bool &cleanup, std::list<RsItem *>& list)
|
||||
bool ftServer::saveList(bool &/*cleanup*/, std::list<RsItem *>& /*list*/)
|
||||
{
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
bool ftServer::loadList(std::list<RsItem *>& load)
|
||||
bool ftServer::loadList(std::list<RsItem *>& /*load*/)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
bool ftServer::loadConfigMap(std::map<std::string, std::string> &configMap)
|
||||
bool ftServer::loadConfigMap(std::map<std::string, std::string> &/*configMap*/)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -979,6 +979,9 @@ bool ftTransferModule::locked_tickPeerTransfer(peerInfo &info)
|
|||
bool ftTransferModule::locked_recvPeerData(peerInfo &info, uint64_t offset,
|
||||
uint32_t chunk_size, void *data)
|
||||
{
|
||||
/* remove unused parameter warnings */
|
||||
(void) data;
|
||||
|
||||
#ifdef FT_DEBUG
|
||||
std::cerr << "ftTransferModule::locked_recvPeerData()";
|
||||
std::cerr << " peerId: " << info.peerId;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue