Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-29 01:16:20 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1250 from PhenomRetroShare/Fix_CppCheckerWarningInFtController

Browse Source 
Fix CppCheck in ftcontroller.cc
This commit is contained in:
csoler 2018-05-06 22:59:20 +02:00 committed by GitHub
commit c20436e215
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
libretroshare/src/ft/ftcontroller.cc
View File

@ -88,16 +88,13 @@ ftFileControl::ftFileControl()
return; return;
} }
ftFileControl::ftFileControl(std::string fname, ftFileControl::ftFileControl(const std::string& fname, const std::string& tmppath, const std::string& dest
std::string tmppath, std::string dest, , uint64_t size, const RsFileHash &hash, TransferRequestFlags flags
uint64_t size, const RsFileHash &hash, TransferRequestFlags flags, , ftFileCreator *fc, ftTransferModule *tm)
ftFileCreator *fc, ftTransferModule *tm) : mName(fname), mCurrentPath(tmppath), mDestination(dest)
:mName(fname), mCurrentPath(tmppath), mDestination(dest), , mTransfer(tm), mCreator(fc), mState(DOWNLOADING), mHash(hash)
mTransfer(tm), mCreator(fc), mState(DOWNLOADING), mHash(hash), , mSize(size), mFlags(flags), mCreateTime(0), mQueuePriority(0), mQueuePosition(0)
mSize(size), mFlags(flags), mCreateTime(0), mQueuePriority(0), mQueuePosition(0) {}
{
return;
}
ftController::ftController(ftDataMultiplex *dm, p3ServiceControl *sc, uint32_t ftServiceId) ftController::ftController(ftDataMultiplex *dm, p3ServiceControl *sc, uint32_t ftServiceId)
: p3Config(), : p3Config(),
@ -1479,7 +1476,7 @@ bool ftController::setPartialsDirectory(std::string path)
path = RsDirUtil::convertPathToUnix(path); path = RsDirUtil::convertPathToUnix(path);
if (!path.find(mDownloadPath)) { if (path.find(mDownloadPath) == std::string::npos) {
return false; return false;
} }
@ -1488,7 +1485,7 @@ bool ftController::setPartialsDirectory(std::string path)
std::list<SharedDirInfo> dirs; std::list<SharedDirInfo> dirs;
rsFiles->getSharedDirectories(dirs); rsFiles->getSharedDirectories(dirs);
for (it = dirs.begin(); it != dirs.end(); ++it) { for (it = dirs.begin(); it != dirs.end(); ++it) {
if (!path.find((*it).filename)) { if (path.find((*it).filename) == std::string::npos) {
return false; return false;
} }
} }

6
libretroshare/src/ft/ftcontroller.h
View File

@ -73,9 +73,9 @@ class ftFileControl
}; };
ftFileControl(); ftFileControl();
ftFileControl(std::string fname, std::string tmppath, std::string dest, ftFileControl( const std::string& fname, const std::string& tmppath, const std::string& dest
uint64_t size, const RsFileHash& hash, TransferRequestFlags flags, , uint64_t size, const RsFileHash& hash, TransferRequestFlags flags
ftFileCreator *fc, ftTransferModule *tm); , ftFileCreator *fc, ftTransferModule *tm);
std::string mName; std::string mName;
std::string mCurrentPath; /* current full path (including name) */ std::string mCurrentPath; /* current full path (including name) */