From 0cdeaa817783bfd74fddbc84079812b0ce77dfe1 Mon Sep 17 00:00:00 2001 From: Tatsuhiro Tsujikawa Date: Thu, 4 Jul 2013 21:44:09 +0900 Subject: [PATCH] Return nullptr directly where std::shared_ptr is expected The constructor of std::shared_ptr which takes nullptr is not explicit so we can return nullptr directly. --- src/AdaptiveURISelector.cc | 2 +- src/AppleMessageDigestImpl.cc | 2 +- src/DHTBucket.cc | 4 ++-- src/DHTTaskFactoryImpl.cc | 2 +- src/DefaultBtAnnounce.cc | 2 +- src/DefaultBtInteractive.cc | 2 +- src/DefaultBtMessageReceiver.cc | 2 +- src/DefaultPeerStorage.cc | 2 +- src/DefaultPieceStorage.cc | 12 ++++++------ src/DownloadContext.cc | 4 ++-- src/FileEntry.cc | 10 +++++----- src/FileEntry.h | 2 +- src/RpcMethodFactory.cc | 2 +- src/SegmentMan.cc | 14 +++++++------- src/ServerStatMan.cc | 2 +- src/UnknownLengthPieceStorage.cc | 8 ++++---- src/download_helper.cc | 4 ++-- test/MockBtAnnounce.h | 2 +- test/MockDHTTaskFactory.h | 12 ++++++------ test/MockPeerStorage.h | 2 +- test/UTMetadataRequestFactoryTest.cc | 2 +- 21 files changed, 47 insertions(+), 47 deletions(-) diff --git a/src/AdaptiveURISelector.cc b/src/AdaptiveURISelector.cc index 5ee353c6..549d7472 100644 --- a/src/AdaptiveURISelector.cc +++ b/src/AdaptiveURISelector.cc @@ -351,7 +351,7 @@ std::shared_ptr AdaptiveURISelector::getServerStats std::string protocol = uri::getFieldString(us, USR_SCHEME, uri.c_str()); return serverStatMan_->find(host, protocol); } else { - return std::shared_ptr(); + return nullptr; } } diff --git a/src/AppleMessageDigestImpl.cc b/src/AppleMessageDigestImpl.cc index 4550d1eb..b162c55b 100644 --- a/src/AppleMessageDigestImpl.cc +++ b/src/AppleMessageDigestImpl.cc @@ -134,7 +134,7 @@ std::shared_ptr MessageDigestImpl::create if (hashType == "md5") { return std::shared_ptr(new MessageDigestMD5()); } - return std::shared_ptr(); + return nullptr; } bool MessageDigestImpl::supports(const std::string& hashType) diff --git a/src/DHTBucket.cc b/src/DHTBucket.cc index f6433bc7..7bebf4c7 100644 --- a/src/DHTBucket.cc +++ b/src/DHTBucket.cc @@ -235,7 +235,7 @@ std::shared_ptr DHTBucket::getNode(const unsigned char* nodeID, const s std::find_if(nodes_.begin(), nodes_.end(), derefEqual(node)); if(itr == nodes_.end() || (*itr)->getIPAddress() != ipaddr || (*itr)->getPort() != port) { - return std::shared_ptr(); + return nullptr; } else { return *itr; } @@ -278,7 +278,7 @@ std::shared_ptr DHTBucket::getLRUQuestionableNode() const std::deque >::const_iterator i = std::find_if(nodes_.begin(), nodes_.end(), FindQuestionableNode()); if(i == nodes_.end()) { - return std::shared_ptr(); + return nullptr; } else { return *i; } diff --git a/src/DHTTaskFactoryImpl.cc b/src/DHTTaskFactoryImpl.cc index 2bed9da5..0d89164f 100644 --- a/src/DHTTaskFactoryImpl.cc +++ b/src/DHTTaskFactoryImpl.cc @@ -103,7 +103,7 @@ std::shared_ptr DHTTaskFactoryImpl::createPeerAnnounceTask(const unsigned char* infoHash) { // TODO - return std::shared_ptr(); + return nullptr; } std::shared_ptr diff --git a/src/DefaultBtAnnounce.cc b/src/DefaultBtAnnounce.cc index 2219ef24..b7f22c2e 100644 --- a/src/DefaultBtAnnounce.cc +++ b/src/DefaultBtAnnounce.cc @@ -205,7 +205,7 @@ std::shared_ptr DefaultBtAnnounce::createUDPTrackerRequest (const std::string& remoteAddr, uint16_t remotePort, uint16_t localPort) { if(!adjustAnnounceList()) { - return std::shared_ptr(); + return nullptr; } NetStat& stat = downloadContext_->getNetStat(); int64_t left = diff --git a/src/DefaultBtInteractive.cc b/src/DefaultBtInteractive.cc index 59a2d8bf..3cc9737e 100644 --- a/src/DefaultBtInteractive.cc +++ b/src/DefaultBtInteractive.cc @@ -123,7 +123,7 @@ std::shared_ptr DefaultBtInteractive::receiveHandshake(bool quickRepl std::shared_ptr message = btMessageReceiver_->receiveHandshake(quickReply); if(!message) { - return std::shared_ptr(); + return nullptr; } if(memcmp(message->getPeerId(), bittorrent::getStaticPeerId(), PEER_ID_LENGTH) == 0) { diff --git a/src/DefaultBtMessageReceiver.cc b/src/DefaultBtMessageReceiver.cc index 152d2f15..f4701cf2 100644 --- a/src/DefaultBtMessageReceiver.cc +++ b/src/DefaultBtMessageReceiver.cc @@ -119,7 +119,7 @@ std::shared_ptr DefaultBtMessageReceiver::receiveMessage() { size_t dataLength = 0; // Give 0 to PeerConnection::receiveMessage() to prevent memcpy. if(!peerConnection_->receiveMessage(0, dataLength)) { - return std::shared_ptr(); + return nullptr; } std::shared_ptr msg = messageFactory_->createBtMessage(peerConnection_->getMsgPayloadBuffer(), diff --git a/src/DefaultPeerStorage.cc b/src/DefaultPeerStorage.cc index 473522de..f550c5e0 100644 --- a/src/DefaultPeerStorage.cc +++ b/src/DefaultPeerStorage.cc @@ -225,7 +225,7 @@ void DefaultPeerStorage::deleteUnusedPeer(size_t delSize) { std::shared_ptr DefaultPeerStorage::checkoutPeer(cuid_t cuid) { if(!isPeerAvailable()) { - return std::shared_ptr(); + return nullptr; } std::shared_ptr peer = unusedPeers_.front(); unusedPeers_.pop_front(); diff --git a/src/DefaultPieceStorage.cc b/src/DefaultPieceStorage.cc index a179091b..656c2e23 100644 --- a/src/DefaultPieceStorage.cc +++ b/src/DefaultPieceStorage.cc @@ -328,7 +328,7 @@ DefaultPieceStorage::getMissingPiece std::vector > pieces; getMissingPiece(pieces, 1, peer, cuid); if(pieces.empty()) { - return std::shared_ptr(); + return nullptr; } else { return pieces.front(); } @@ -342,7 +342,7 @@ std::shared_ptr DefaultPieceStorage::getMissingPiece std::vector > pieces; getMissingPiece(pieces, 1, peer, excludedIndexes, cuid); if(pieces.empty()) { - return std::shared_ptr(); + return nullptr; } else { return pieces.front(); } @@ -355,7 +355,7 @@ std::shared_ptr DefaultPieceStorage::getMissingFastPiece std::vector > pieces; getMissingFastPiece(pieces, 1, peer, cuid); if(pieces.empty()) { - return std::shared_ptr(); + return nullptr; } else { return pieces.front(); } @@ -369,7 +369,7 @@ std::shared_ptr DefaultPieceStorage::getMissingFastPiece std::vector > pieces; getMissingFastPiece(pieces, 1, peer, excludedIndexes, cuid); if(pieces.empty()) { - return std::shared_ptr(); + return nullptr; } else { return pieces.front(); } @@ -394,7 +394,7 @@ std::shared_ptr DefaultPieceStorage::getMissingPiece (index, minSplitSize, ignoreBitfield, length)) { return checkOutPiece(index, cuid); } else { - return std::shared_ptr(); + return nullptr; } } @@ -403,7 +403,7 @@ std::shared_ptr DefaultPieceStorage::getMissingPiece cuid_t cuid) { if(hasPiece(index) || isPieceUsed(index)) { - return std::shared_ptr(); + return nullptr; } else { return checkOutPiece(index, cuid); } diff --git a/src/DownloadContext.cc b/src/DownloadContext.cc index 6591b3ea..2c37e300 100644 --- a/src/DownloadContext.cc +++ b/src/DownloadContext.cc @@ -96,7 +96,7 @@ DownloadContext::findFileEntryByOffset(int64_t offset) const { if(fileEntries_.empty() || (offset > 0 && fileEntries_.back()->getLastOffset() <= offset)) { - return std::shared_ptr(); + return nullptr; } std::shared_ptr obj(new FileEntry()); @@ -222,7 +222,7 @@ DownloadContext::getFirstRequestedFileEntry() const return *i; } } - return std::shared_ptr(); + return nullptr; } size_t DownloadContext::countRequestedFileEntry() const diff --git a/src/FileEntry.cc b/src/FileEntry.cc index 79679052..478a90ac 100644 --- a/src/FileEntry.cc +++ b/src/FileEntry.cc @@ -221,12 +221,12 @@ FileEntry::findFasterRequest(const std::shared_ptr& base) const int startupIdleTime = 10; if(requestPool_.empty() || lastFasterReplace_.difference(global::wallclock()) < startupIdleTime) { - return std::shared_ptr(); + return nullptr; } const std::shared_ptr& fastest = (*requestPool_.begin())->getPeerStat(); if(!fastest) { - return std::shared_ptr(); + return nullptr; } const std::shared_ptr& basestat = base->getPeerStat(); // TODO hard coded value. See PREF_STARTUP_IDLE_TIME @@ -241,7 +241,7 @@ FileEntry::findFasterRequest(const std::shared_ptr& base) lastFasterReplace_ = global::wallclock(); return fastestRequest; } - return std::shared_ptr(); + return nullptr; } std::shared_ptr @@ -253,7 +253,7 @@ FileEntry::findFasterRequest const int startupIdleTime = 10; const int SPEED_THRESHOLD = 20*1024; if(lastFasterReplace_.difference(global::wallclock()) < startupIdleTime) { - return std::shared_ptr(); + return nullptr; } std::vector inFlightHosts; enumerateInFlightHosts(inFlightRequests_.begin(), inFlightRequests_.end(), @@ -307,7 +307,7 @@ FileEntry::findFasterRequest return fastestRequest; } A2_LOG_DEBUG("No faster server found."); - return std::shared_ptr(); + return nullptr; } void FileEntry::storePool(const std::shared_ptr& request) diff --git a/src/FileEntry.h b/src/FileEntry.h index 648c6958..cdab3174 100644 --- a/src/FileEntry.h +++ b/src/FileEntry.h @@ -287,7 +287,7 @@ std::shared_ptr getFirstRequestedFileEntry return *first; } } - return std::shared_ptr(); + return nullptr; } // Counts the number of files selected in the given iterator range diff --git a/src/RpcMethodFactory.cc b/src/RpcMethodFactory.cc index 3e1d5353..845a7856 100644 --- a/src/RpcMethodFactory.cc +++ b/src/RpcMethodFactory.cc @@ -129,7 +129,7 @@ createMethod(const std::string& methodName) } else if(methodName == SystemMulticallRpcMethod::getMethodName()) { return std::shared_ptr(new SystemMulticallRpcMethod()); } else { - return std::shared_ptr(); + return nullptr; } } } // namespace diff --git a/src/SegmentMan.cc b/src/SegmentMan.cc index b872682f..ae418b33 100644 --- a/src/SegmentMan.cc +++ b/src/SegmentMan.cc @@ -132,7 +132,7 @@ std::shared_ptr SegmentMan::checkoutSegment (cuid_t cuid, const std::shared_ptr& piece) { if(!piece) { - return std::shared_ptr(); + return nullptr; } A2_LOG_DEBUG(fmt("Attach segment#%lu to CUID#%" PRId64 ".", static_cast(piece->getIndex()), @@ -241,7 +241,7 @@ void SegmentMan::getSegment std::shared_ptr SegmentMan::getSegmentWithIndex (cuid_t cuid, size_t index) { if(index > 0 && downloadContext_->getNumPieces() <= index) { - return std::shared_ptr(); + return nullptr; } return checkoutSegment(cuid, pieceStorage_->getMissingPiece(index, cuid)); } @@ -250,14 +250,14 @@ std::shared_ptr SegmentMan::getCleanSegmentIfOwnerIsIdle (cuid_t cuid, size_t index) { if(index > 0 && downloadContext_->getNumPieces() <= index) { - return std::shared_ptr(); + return nullptr; } for(SegmentEntries::const_iterator itr = usedSegmentEntries_.begin(), eoi = usedSegmentEntries_.end(); itr != eoi; ++itr) { const std::shared_ptr& segmentEntry = *itr; if(segmentEntry->segment->getIndex() == index) { if(segmentEntry->segment->getWrittenLength() > 0) { - return std::shared_ptr(); + return nullptr; } if(segmentEntry->cuid == cuid) { return segmentEntry->segment; @@ -268,11 +268,11 @@ std::shared_ptr SegmentMan::getCleanSegmentIfOwnerIsIdle cancelSegment(owner); return getSegmentWithIndex(cuid, index); } else { - return std::shared_ptr(); + return nullptr; } } } - return std::shared_ptr(); + return nullptr; } void SegmentMan::cancelSegmentInternal @@ -399,7 +399,7 @@ std::shared_ptr SegmentMan::getPeerStat(cuid_t cuid) const return *i; } } - return std::shared_ptr(); + return nullptr; } namespace { diff --git a/src/ServerStatMan.cc b/src/ServerStatMan.cc index f22e0585..d748ab51 100644 --- a/src/ServerStatMan.cc +++ b/src/ServerStatMan.cc @@ -62,7 +62,7 @@ std::shared_ptr ServerStatMan::find(const std::string& hostname, std::shared_ptr ss(new ServerStat(hostname, protocol)); ServerStatSet::iterator i = serverStats_.find(ss); if(i == serverStats_.end()) { - return std::shared_ptr(); + return nullptr; } else { return *i; } diff --git a/src/UnknownLengthPieceStorage.cc b/src/UnknownLengthPieceStorage.cc index d111723c..00d324c9 100644 --- a/src/UnknownLengthPieceStorage.cc +++ b/src/UnknownLengthPieceStorage.cc @@ -142,13 +142,13 @@ std::shared_ptr UnknownLengthPieceStorage::getMissingPiece cuid_t cuid) { if(downloadFinished_) { - return std::shared_ptr(); + return nullptr; } if(!piece_) { piece_.reset(new Piece()); return piece_; } else { - return std::shared_ptr(); + return nullptr; } } @@ -159,7 +159,7 @@ std::shared_ptr UnknownLengthPieceStorage::getMissingPiece if(index == 0) { return getMissingPiece(0, 0, 0, cuid); } else { - return std::shared_ptr(); + return nullptr; } } @@ -172,7 +172,7 @@ std::shared_ptr UnknownLengthPieceStorage::getPiece(size_t index) return piece_; } } else { - return std::shared_ptr(); + return nullptr; } } diff --git a/src/download_helper.cc b/src/download_helper.cc index 0fdcd81d..a6ba4aea 100644 --- a/src/download_helper.cc +++ b/src/download_helper.cc @@ -532,12 +532,12 @@ createMetadataInfoFromFirstFileEntry const std::shared_ptr& dctx) { if(dctx->getFileEntries().empty()) { - return std::shared_ptr(); + return nullptr; } else { std::vector uris; dctx->getFileEntries()[0]->getUris(uris); if(uris.empty()) { - return std::shared_ptr(); + return nullptr; } return std::make_shared(gid, uris[0]); } diff --git a/test/MockBtAnnounce.h b/test/MockBtAnnounce.h index e1b00f27..170d6e44 100644 --- a/test/MockBtAnnounce.h +++ b/test/MockBtAnnounce.h @@ -29,7 +29,7 @@ public: virtual std::shared_ptr createUDPTrackerRequest(const std::string& remoteAddr, uint16_t remotePort, uint16_t localPort) { - return std::shared_ptr(); + return nullptr; } void setAnnounceUrl(const std::string& url) { diff --git a/test/MockDHTTaskFactory.h b/test/MockDHTTaskFactory.h index 7b129cf8..b93465a0 100644 --- a/test/MockDHTTaskFactory.h +++ b/test/MockDHTTaskFactory.h @@ -13,18 +13,18 @@ public: createPingTask(const std::shared_ptr& remoteNode, int numRetry = 0) { - return std::shared_ptr(); + return nullptr; } virtual std::shared_ptr createNodeLookupTask(const unsigned char* targetID) { - return std::shared_ptr(); + return nullptr; } virtual std::shared_ptr createBucketRefreshTask() { - return std::shared_ptr(); + return nullptr; } virtual std::shared_ptr @@ -32,20 +32,20 @@ public: uint16_t tcpPort, const std::shared_ptr& peerStorage) { - return std::shared_ptr(); + return nullptr; } virtual std::shared_ptr createPeerAnnounceTask(const unsigned char* infoHash) { - return std::shared_ptr(); + return nullptr; } virtual std::shared_ptr createReplaceNodeTask(const std::shared_ptr& bucket, const std::shared_ptr& newNode) { - return std::shared_ptr(); + return nullptr; } }; diff --git a/test/MockPeerStorage.h b/test/MockPeerStorage.h index 7a28c329..2b8176ff 100644 --- a/test/MockPeerStorage.h +++ b/test/MockPeerStorage.h @@ -77,7 +77,7 @@ public: virtual std::shared_ptr checkoutPeer(cuid_t cuid) { - return std::shared_ptr(); + return nullptr; } virtual void returnPeer(const std::shared_ptr& peer) diff --git a/test/UTMetadataRequestFactoryTest.cc b/test/UTMetadataRequestFactoryTest.cc index e42a7f7a..caa6f080 100644 --- a/test/UTMetadataRequestFactoryTest.cc +++ b/test/UTMetadataRequestFactoryTest.cc @@ -34,7 +34,7 @@ public: cuid_t cuid) { if(missingIndexes.empty()) { - return std::shared_ptr(); + return nullptr; } else { size_t index = missingIndexes.front(); missingIndexes.pop_front();