From dca33daae84f7c8f651c566e8b8b06c21db19c1b Mon Sep 17 00:00:00 2001 From: Phenom Date: Sun, 6 May 2018 18:53:29 +0200 Subject: [PATCH] Fix CppCheck in ftcontroller.cc /libretroshare/src/ft/ftcontroller.cc:91: warning: Cppcheck(passedByValue): Function parameter 'fname' should be passed by reference. /libretroshare/src/ft/ftcontroller.cc:92: warning: Cppcheck(passedByValue): Function parameter 'tmppath' should be passed by reference. /libretroshare/src/ft/ftcontroller.cc:92: warning: Cppcheck(passedByValue): Function parameter 'dest' should be passed by reference. /libretroshare/src/ft/ftcontroller.cc:1482: warning: Cppcheck(stlIfStrFind): Inefficient usage of string::find() in condition; string::compare() would be faster. /libretroshare/src/ft/ftcontroller.cc:1491: warning: Cppcheck(stlIfStrFind): Inefficient usage of string::find() in condition; string::compare() would be faster. --- libretroshare/src/ft/ftcontroller.cc | 21 +++++++++------------ libretroshare/src/ft/ftcontroller.h | 6 +++--- 2 files changed, 12 insertions(+), 15 deletions(-) diff --git a/libretroshare/src/ft/ftcontroller.cc b/libretroshare/src/ft/ftcontroller.cc index 0cb236358..f1500036f 100644 --- a/libretroshare/src/ft/ftcontroller.cc +++ b/libretroshare/src/ft/ftcontroller.cc @@ -88,16 +88,13 @@ ftFileControl::ftFileControl() return; } -ftFileControl::ftFileControl(std::string fname, - std::string tmppath, std::string dest, - uint64_t size, const RsFileHash &hash, TransferRequestFlags flags, - ftFileCreator *fc, ftTransferModule *tm) - :mName(fname), mCurrentPath(tmppath), mDestination(dest), - mTransfer(tm), mCreator(fc), mState(DOWNLOADING), mHash(hash), - mSize(size), mFlags(flags), mCreateTime(0), mQueuePriority(0), mQueuePosition(0) -{ - return; -} +ftFileControl::ftFileControl(const std::string& fname, const std::string& tmppath, const std::string& dest + , uint64_t size, const RsFileHash &hash, TransferRequestFlags flags + , ftFileCreator *fc, ftTransferModule *tm) + : mName(fname), mCurrentPath(tmppath), mDestination(dest) + , mTransfer(tm), mCreator(fc), mState(DOWNLOADING), mHash(hash) + , mSize(size), mFlags(flags), mCreateTime(0), mQueuePriority(0), mQueuePosition(0) +{} ftController::ftController(ftDataMultiplex *dm, p3ServiceControl *sc, uint32_t ftServiceId) : p3Config(), @@ -1479,7 +1476,7 @@ bool ftController::setPartialsDirectory(std::string path) path = RsDirUtil::convertPathToUnix(path); - if (!path.find(mDownloadPath)) { + if (path.find(mDownloadPath) == std::string::npos) { return false; } @@ -1488,7 +1485,7 @@ bool ftController::setPartialsDirectory(std::string path) std::list dirs; rsFiles->getSharedDirectories(dirs); for (it = dirs.begin(); it != dirs.end(); ++it) { - if (!path.find((*it).filename)) { + if (path.find((*it).filename) == std::string::npos) { return false; } } diff --git a/libretroshare/src/ft/ftcontroller.h b/libretroshare/src/ft/ftcontroller.h index 67b080843..5a9140267 100644 --- a/libretroshare/src/ft/ftcontroller.h +++ b/libretroshare/src/ft/ftcontroller.h @@ -73,9 +73,9 @@ class ftFileControl }; ftFileControl(); - ftFileControl(std::string fname, std::string tmppath, std::string dest, - uint64_t size, const RsFileHash& hash, TransferRequestFlags flags, - ftFileCreator *fc, ftTransferModule *tm); + ftFileControl( const std::string& fname, const std::string& tmppath, const std::string& dest + , uint64_t size, const RsFileHash& hash, TransferRequestFlags flags + , ftFileCreator *fc, ftTransferModule *tm); std::string mName; std::string mCurrentPath; /* current full path (including name) */