From 8b0c701266a56c5ccc7c4ea6b605a9e0c9ef823d Mon Sep 17 00:00:00 2001 From: Tatsuhiro Tsujikawa Date: Mon, 1 Oct 2012 23:52:22 +0900 Subject: [PATCH] Removed trailing spaces --- deps/wslay/tests/wslay_event_test.c | 4 +-- src/AbstractDiskWriter.cc | 2 +- src/AbstractDiskWriter.h | 2 +- src/AbstractSingleDiskAdaptor.h | 6 ++-- src/ActivePeerConnectionCommand.h | 2 +- src/AdaptiveFileAllocationIterator.cc | 2 +- src/AdaptiveFileAllocationIterator.h | 2 +- src/AdaptiveURISelector.cc | 18 +++++------ src/AdaptiveURISelector.h | 2 +- src/BitfieldMan.cc | 6 ++-- src/BitfieldMan.h | 4 +-- src/BtLeecherStateChoke.cc | 6 ++-- src/BtRegistry.cc | 2 +- src/BtSeederStateChoke.cc | 4 +-- src/BtSeederStateChoke.h | 2 +- src/BtSetup.cc | 8 ++--- src/BtStopDownloadCommand.h | 2 +- src/Checksum.cc | 2 +- src/Checksum.h | 2 +- src/ChunkChecksum.h | 2 +- src/ChunkedDecodingStreamFilter.h | 2 +- src/CookieStorage.cc | 2 +- src/CookieStorage.h | 4 +-- src/DHTAbstractMessage.h | 2 +- src/DHTAbstractNodeLookupTask.h | 10 +++--- src/DHTAbstractTask.h | 4 +-- src/DHTAnnouncePeerMessage.h | 2 +- src/DHTAutoSaveCommand.h | 2 +- src/DHTBucket.cc | 4 +-- src/DHTBucket.h | 2 +- src/DHTConnectionImpl.h | 2 +- src/DHTEntryPointNameResolveCommand.cc | 4 +-- src/DHTFindNodeMessage.h | 2 +- src/DHTFindNodeReplyMessage.h | 6 ++-- src/DHTGetPeersMessage.h | 2 +- src/DHTGetPeersReplyMessage.h | 2 +- src/DHTMessage.h | 2 +- src/DHTMessageFactoryImpl.h | 2 +- src/DHTMessageReceiver.h | 2 +- src/DHTMessageTracker.h | 2 +- src/DHTMessageTrackerEntry.h | 4 +-- src/DHTNode.h | 4 +-- src/DHTPeerAnnounceEntry.h | 2 +- src/DHTPeerAnnounceStorage.cc | 2 +- src/DHTPeerLookupTask.cc | 4 +-- src/DHTPeerLookupTask.h | 4 +-- src/DHTPingTask.h | 2 +- src/DHTQueryMessage.h | 2 +- src/DHTReplaceNodeTask.h | 2 +- src/DHTResponseMessage.h | 2 +- src/DHTRoutingTable.h | 4 +-- src/DHTRoutingTableDeserializer.cc | 4 +-- src/DHTRoutingTableSerializer.cc | 2 +- src/DHTTaskFactory.h | 2 +- src/DHTTaskFactoryImpl.h | 2 +- src/DNSCache.h | 4 +-- src/DefaultBtInteractive.cc | 6 ++-- src/DefaultBtInteractive.h | 4 +-- src/DefaultBtMessageDispatcher.cc | 4 +-- src/DefaultBtProgressInfoFile.cc | 4 +-- src/DefaultPeerStorage.h | 2 +- src/DefaultPieceStorage.h | 10 +++--- src/DownloadContext.h | 6 ++-- src/DownloadEngine.h | 6 ++-- src/EpollEventPoll.cc | 2 +- src/Event.h | 24 +++++++------- src/Exception.h | 2 +- src/FatalException.cc | 2 +- src/FeedbackURISelector.cc | 2 +- src/File.h | 2 +- src/FileAllocationCommand.cc | 2 +- src/FtpConnection.cc | 2 +- src/FtpInitiateConnectionCommand.cc | 6 ++-- src/FtpNegotiationCommand.cc | 8 ++--- src/GZipDecodingStreamFilter.h | 2 +- src/GrowSegment.h | 2 +- src/HttpRequest.cc | 6 ++-- src/HttpRequest.h | 8 ++--- src/HttpResponse.h | 2 +- src/HttpResponseCommand.cc | 2 +- src/HttpServerResponseCommand.h | 2 +- src/HttpSkipResponseCommand.cc | 2 +- src/InitiatorMSEHandshakeCommand.cc | 2 +- src/LibgcryptMessageDigestImpl.h | 2 +- src/LibsslMessageDigestImpl.h | 2 +- src/MSEHandshake.cc | 4 +-- src/MSEHandshake.h | 2 +- src/MetadataInfo.h | 2 +- src/MetalinkEntry.h | 2 +- src/MetalinkParserController.cc | 2 +- src/MetalinkParserState.h | 2 +- src/MetalinkParserStateMachine.cc | 2 +- src/MetalinkParserStateMachine.h | 4 +-- src/MultiDiskAdaptor.cc | 10 +++--- src/MultiFileAllocationIterator.h | 2 +- src/Netrc.cc | 2 +- src/Option.h | 2 +- src/Peer.cc | 2 +- src/Peer.h | 8 ++--- src/PeerAbstractCommand.cc | 2 +- src/PeerAddrEntry.h | 2 +- src/PeerInteractionCommand.cc | 2 +- src/PeerListenCommand.h | 4 +-- src/PeerReceiveHandshakeCommand.h | 2 +- src/PeerSessionResource.cc | 2 +- src/PeerSessionResource.h | 4 +-- src/Piece.h | 2 +- src/PieceStatMan.h | 2 +- src/PieceStorage.h | 10 +++--- src/Platform.cc | 4 +-- src/PollEventPoll.cc | 2 +- src/Request.cc | 2 +- src/RequestGroup.cc | 8 ++--- src/RequestGroup.h | 2 +- src/RequestSlot.h | 4 +-- src/RpcMethod.cc | 2 +- src/RpcMethodImpl.cc | 6 ++-- src/RpcResponse.h | 2 +- src/Segment.h | 2 +- src/SegmentMan.h | 4 +-- src/SelectEventPoll.cc | 2 +- src/SelectEventPoll.h | 26 +++++++-------- src/SequentialDispatcherCommand.h | 2 +- src/ServerStat.cc | 4 +-- src/ServerStat.h | 6 ++-- src/ServerStatMan.cc | 2 +- src/SharedHandle.h | 6 ++-- src/SimpleRandomizer.cc | 2 +- src/SingleFileAllocationIterator.h | 2 +- src/SocketBuffer.h | 2 +- src/SocketCore.cc | 10 +++--- src/TimeA2.cc | 2 +- src/UTMetadataExtensionMessage.h | 2 +- src/UTMetadataRequestFactory.cc | 2 +- src/UnionSeedCriteria.h | 4 +-- src/UnknownLengthPieceStorage.h | 10 +++--- src/WebSocketInteractionCommand.h | 4 +-- src/WebSocketResponseCommand.h | 2 +- src/WebSocketSession.cc | 2 +- src/XmlRpcDiskWriter.cc | 2 +- src/XmlRpcDiskWriter.h | 2 +- src/XmlRpcRequestParserController.cc | 2 +- src/XmlRpcRequestParserController.h | 2 +- src/XmlRpcRequestParserState.h | 2 +- src/XmlRpcRequestParserStateImpl.cc | 20 ++++++------ src/XmlRpcRequestParserStateImpl.h | 28 ++++++++-------- src/asctime_r.h | 4 +-- src/base32.cc | 2 +- src/bitfield.h | 32 +++++++++---------- src/bittorrent_helper.cc | 4 +-- src/bittorrent_helper.h | 2 +- src/cookie_helper.cc | 4 +-- src/prefs.cc | 2 +- src/uri.cc | 2 +- src/usage_text.h | 2 +- src/util.cc | 8 ++--- test/AbstractCommandTest.cc | 2 +- test/AnnounceListTest.cc | 4 +-- test/AuthConfigFactoryTest.cc | 6 ++-- test/BitfieldManTest.cc | 12 +++---- test/BittorrentHelperTest.cc | 6 ++-- test/BtChokeMessageTest.cc | 2 +- test/BtDependencyTest.cc | 14 ++++---- test/BtExtendedMessageTest.cc | 2 +- test/BtHaveAllMessageTest.cc | 6 ++-- test/BtHaveMessageTest.cc | 2 +- test/BtPieceMessageTest.cc | 10 +++--- test/BtRejectMessageTest.cc | 8 ++--- test/BtRequestMessageTest.cc | 10 +++--- test/CookieBoxTest.cc | 2 +- test/CookieHelperTest.cc | 4 +-- test/CookieStorageTest.cc | 2 +- test/CookieTest.cc | 2 +- test/DHTGetPeersMessageTest.cc | 2 +- test/DHTGetPeersReplyMessageTest.cc | 4 +-- test/DHTMessageFactoryImplTest.cc | 20 ++++++------ test/DHTMessageTrackerEntryTest.cc | 4 +-- test/DHTMessageTrackerTest.cc | 2 +- test/DHTPeerAnnounceEntryTest.cc | 4 +-- test/DHTPeerAnnounceStorageTest.cc | 2 +- test/DHTRoutingTableDeserializerTest.cc | 4 +-- test/DHTRoutingTableSerializerTest.cc | 4 +-- test/DHTTokenTrackerTest.cc | 2 +- test/DefaultBtAnnounceTest.cc | 10 +++--- test/DefaultBtMessageDispatcherTest.cc | 16 +++++----- test/DefaultBtMessageFactoryTest.cc | 2 +- test/DefaultBtProgressInfoFileTest.cc | 16 +++++----- test/DefaultBtRequestFactoryTest.cc | 6 ++-- test/DefaultPeerStorageTest.cc | 4 +-- test/DefaultPieceStorageTest.cc | 14 ++++---- test/DownloadContextTest.cc | 4 +-- test/DownloadHelperTest.cc | 20 ++++++------ test/FeedbackURISelectorTest.cc | 8 ++--- test/FileEntryTest.cc | 6 ++-- test/FileTest.cc | 10 +++--- test/GrowSegmentTest.cc | 4 +-- test/HttpRequestTest.cc | 24 +++++++------- test/InorderURISelectorTest.cc | 4 +-- test/IteratableChecksumValidatorTest.cc | 2 +- test/LpdMessageDispatcherTest.cc | 2 +- test/Metalink2RequestGroupTest.cc | 4 +-- test/MetalinkEntryTest.cc | 4 +-- test/MetalinkHelperTest.cc | 4 +-- test/MetalinkProcessorTest.cc | 22 ++++++------- test/MockBtMessage.h | 4 +-- test/MockBtMessageDispatcher.h | 2 +- test/MockBtMessageFactory.h | 6 ++-- test/MockDHTMessage.h | 6 ++-- test/MockDHTMessageDispatcher.h | 2 +- test/MockDHTMessageFactory.h | 2 +- test/MockDHTTaskFactory.h | 2 +- test/MockExtensionMessage.h | 2 +- test/MockPeerStorage.h | 2 +- test/MockPieceStorage.h | 6 ++-- test/MockSegment.h | 2 +- test/MultiDiskAdaptorTest.cc | 26 +++++++-------- test/MultiFileAllocationIteratorTest.cc | 2 +- test/NetrcAuthResolverTest.cc | 2 +- test/NsCookieParserTest.cc | 4 +-- test/OptionTest.cc | 4 +-- test/PeerSessionResourceTest.cc | 8 ++--- test/PieceTest.cc | 8 ++--- test/RequestGroupManTest.cc | 4 +-- test/RequestGroupTest.cc | 4 +-- test/RequestTest.cc | 6 ++-- test/RpcHelperTest.cc | 2 +- test/RpcMethodTest.cc | 22 ++++++------- test/SegmentManTest.cc | 6 ++-- test/SequentialPickerTest.cc | 2 +- test/ServerStatTest.cc | 2 +- test/ShareRatioSeedCriteriaTest.cc | 6 ++-- test/SignatureTest.cc | 2 +- test/TimeSeedCriteriaTest.cc | 2 +- test/UTMetadataDataExtensionMessageTest.cc | 2 +- test/UTMetadataRequestExtensionMessageTest.cc | 2 +- test/UriTest.cc | 10 +++--- test/UtilTest.cc | 10 +++--- test/ValueBaseTest.cc | 2 +- 238 files changed, 571 insertions(+), 571 deletions(-) diff --git a/deps/wslay/tests/wslay_event_test.c b/deps/wslay/tests/wslay_event_test.c index 1bcc5065..983b3bc2 100644 --- a/deps/wslay/tests/wslay_event_test.c +++ b/deps/wslay/tests/wslay_event_test.c @@ -190,7 +190,7 @@ void test_wslay_event_send_fragmented_msg_with_ctrl(void) memset(&acc, 0, sizeof(acc)); ud.acc = &acc; wslay_event_context_server_init(&ctx, &callbacks, &ud); - + memset(&arg, 0, sizeof(arg)); arg.opcode = WSLAY_TEXT_FRAME; arg.source.data = &df; @@ -231,7 +231,7 @@ void test_wslay_event_send_ctrl_msg_first(void) memset(&acc, 0, sizeof(acc)); ud.acc = &acc; wslay_event_context_server_init(&ctx, &callbacks, &ud); - + memset(&arg, 0, sizeof(arg)); arg.opcode = WSLAY_PING; arg.msg_length = 0; diff --git a/src/AbstractDiskWriter.cc b/src/AbstractDiskWriter.cc index af3fd526..ed0d1842 100644 --- a/src/AbstractDiskWriter.cc +++ b/src/AbstractDiskWriter.cc @@ -142,7 +142,7 @@ void AbstractDiskWriter::createFile(int addFlags) filename_.c_str(), util::safeStrerror(errNum).c_str()), error_code::FILE_CREATE_ERROR); - } + } } ssize_t AbstractDiskWriter::writeDataInternal(const unsigned char* data, diff --git a/src/AbstractDiskWriter.h b/src/AbstractDiskWriter.h index 8ba9292c..e5834aa1 100644 --- a/src/AbstractDiskWriter.h +++ b/src/AbstractDiskWriter.h @@ -80,7 +80,7 @@ public: virtual void allocate(int64_t offset, int64_t length); virtual int64_t size(); - + virtual void enableReadOnly(); virtual void disableReadOnly(); diff --git a/src/AbstractSingleDiskAdaptor.h b/src/AbstractSingleDiskAdaptor.h index 172b87b0..4427ee19 100644 --- a/src/AbstractSingleDiskAdaptor.h +++ b/src/AbstractSingleDiskAdaptor.h @@ -70,7 +70,7 @@ public: virtual int64_t size(); virtual void truncate(int64_t length); - + virtual SharedHandle fileAllocationIterator(); // Make sure that DiskWriter is set before calling this function. @@ -78,11 +78,11 @@ public: // Make sure that DiskWriter is set before calling this function. virtual void disableReadOnly(); - + virtual bool isReadOnlyEnabled() const { return readOnly_; } virtual void enableMmap(); - + virtual void cutTrailingGarbage(); virtual const std::string& getFilePath() = 0; diff --git a/src/ActivePeerConnectionCommand.h b/src/ActivePeerConnectionCommand.h index b1912584..929fd16e 100644 --- a/src/ActivePeerConnectionCommand.h +++ b/src/ActivePeerConnectionCommand.h @@ -68,7 +68,7 @@ public: time_t interval); virtual ~ActivePeerConnectionCommand(); - + virtual bool execute(); void connectToPeer(const SharedHandle& peer); diff --git a/src/AdaptiveFileAllocationIterator.cc b/src/AdaptiveFileAllocationIterator.cc index c343af1e..3de13e27 100644 --- a/src/AdaptiveFileAllocationIterator.cc +++ b/src/AdaptiveFileAllocationIterator.cc @@ -86,7 +86,7 @@ void AdaptiveFileAllocationIterator::allocateChunk() allocator_->allocateChunk(); } } - + bool AdaptiveFileAllocationIterator::finished() { if(!allocator_) { diff --git a/src/AdaptiveFileAllocationIterator.h b/src/AdaptiveFileAllocationIterator.h index 4ad4b210..3dc6c970 100644 --- a/src/AdaptiveFileAllocationIterator.h +++ b/src/AdaptiveFileAllocationIterator.h @@ -58,7 +58,7 @@ public: virtual ~AdaptiveFileAllocationIterator(); virtual void allocateChunk(); - + virtual bool finished(); virtual int64_t getCurrentLength(); diff --git a/src/AdaptiveURISelector.cc b/src/AdaptiveURISelector.cc index eca81f82..8c507f7d 100644 --- a/src/AdaptiveURISelector.cc +++ b/src/AdaptiveURISelector.cc @@ -58,10 +58,10 @@ namespace aria2 { -/* In that URI Selector, select method returns one of the bests - * mirrors for first and reserved connections. For supplementary - * ones, it returns mirrors which has not been tested yet, and - * if each of them already tested, returns mirrors which has to +/* In that URI Selector, select method returns one of the bests + * mirrors for first and reserved connections. For supplementary + * ones, it returns mirrors which has not been tested yet, and + * if each of them already tested, returns mirrors which has to * be tested again. Otherwise, it doesn't return anymore mirrors. */ @@ -87,7 +87,7 @@ std::string AdaptiveURISelector::select // failed uris that may succeed with more permissive values mayRetryWithIncreasedTimeout(fileEntry); } - + std::string selected = selectOne(uris); if(selected != A2STR::NIL) @@ -128,12 +128,12 @@ std::string AdaptiveURISelector::selectOne(const std::deque& uris) const size_t numPieces = requestGroup_->getDownloadContext()->getNumPieces(); - bool reservedContext = numPieces > 0 && + bool reservedContext = numPieces > 0 && static_cast(nbConnections_) > std::min (numPieces, static_cast(requestGroup_->getNumConcurrentCommand())); bool selectBest = numPieces == 0 || reservedContext; - + if(numPieces > 0) ++nbConnections_; @@ -148,7 +148,7 @@ std::string AdaptiveURISelector::selectOne(const std::deque& uris) return notTested; } } - + if(!selectBest && nbConnections_ > 1 && nbServerToEvaluate_ > 0) { nbServerToEvaluate_--; std::string notTested = getFirstNotTestedUri(uris); @@ -184,7 +184,7 @@ std::string AdaptiveURISelector::getBestMirror int max = getMaxDownloadSpeed(uris); int min = max-(int)(max*0.25); std::deque bests = getUrisBySpeed(uris, min); - + if (bests.size() < 2) { std::string uri = getMaxDownloadSpeedUri(uris); A2_LOG_DEBUG(fmt("AdaptiveURISelector: choosing the best mirror :" diff --git a/src/AdaptiveURISelector.h b/src/AdaptiveURISelector.h index a2d4843c..df462e07 100644 --- a/src/AdaptiveURISelector.h +++ b/src/AdaptiveURISelector.h @@ -70,7 +70,7 @@ private: int getNbTestedServers(const std::deque& uris) const; std::string getBestMirror(const std::deque& uris) const; public: - AdaptiveURISelector(const SharedHandle& serverStatMan, + AdaptiveURISelector(const SharedHandle& serverStatMan, RequestGroup* requestGroup); virtual ~AdaptiveURISelector(); diff --git a/src/BitfieldMan.cc b/src/BitfieldMan.cc index dab736c8..b0f202d4 100644 --- a/src/BitfieldMan.cc +++ b/src/BitfieldMan.cc @@ -266,7 +266,7 @@ bool getSparseMissingUnusedIndex maxRange = currentRange; } nextIndex = currentRange.endIndex; - + } if(maxRange.getSize()) { if(maxRange.startIndex == 0) { @@ -897,7 +897,7 @@ BitfieldMan::Range::Range(size_t startIndex, size_t endIndex) startIndex(startIndex), endIndex(endIndex) {} - + size_t BitfieldMan::Range::getSize() const { return endIndex-startIndex; @@ -912,7 +912,7 @@ bool BitfieldMan::Range::operator<(const Range& range) const { return getSize() < range.getSize(); } - + bool BitfieldMan::Range::operator==(const Range& range) const { return getSize() == range.getSize(); diff --git a/src/BitfieldMan.h b/src/BitfieldMan.h index f82557d4..fa856c08 100644 --- a/src/BitfieldMan.h +++ b/src/BitfieldMan.h @@ -80,7 +80,7 @@ public: Range(size_t startIndex = 0, size_t endIndex = 0); size_t getSize() const; size_t getMidIndex() const; - bool operator<(const Range& range) const; + bool operator<(const Range& range) const; bool operator==(const Range& range) const; }; public: @@ -248,7 +248,7 @@ public: // Clears filter and disables filter void clearFilter(); - + void enableFilter(); void disableFilter(); bool isFilterEnabled() const diff --git a/src/BtLeecherStateChoke.cc b/src/BtLeecherStateChoke.cc index 79bb72a2..1726e132 100644 --- a/src/BtLeecherStateChoke.cc +++ b/src/BtLeecherStateChoke.cc @@ -150,7 +150,7 @@ void BtLeecherStateChoke::plannedOptimisticUnchoke { std::for_each(peerEntries.begin(), peerEntries.end(), std::mem_fun_ref(&PeerEntry::disableOptUnchoking)); - + std::vector::iterator i = std::partition(peerEntries.begin(), peerEntries.end(), PeerFilter(true, true)); @@ -168,7 +168,7 @@ void BtLeecherStateChoke::regularUnchoke(std::vector& peerEntries) std::vector::iterator rest = std::partition(peerEntries.begin(), peerEntries.end(), std::mem_fun_ref(&PeerEntry::isRegularUnchoker)); - + std::sort(peerEntries.begin(), rest); // the number of regular unchokers @@ -218,7 +218,7 @@ BtLeecherStateChoke::executeChoke peerEntries.erase(std::remove_if(peerEntries.begin(), peerEntries.end(), std::mem_fun_ref(&PeerEntry::isSnubbing)), peerEntries.end()); - + std::for_each(peerEntries.begin(), peerEntries.end(), std::mem_fun_ref(&PeerEntry::enableChokingRequired)); diff --git a/src/BtRegistry.cc b/src/BtRegistry.cc index 07ad3a3a..1189a652 100644 --- a/src/BtRegistry.cc +++ b/src/BtRegistry.cc @@ -72,7 +72,7 @@ BtRegistry::getDownloadContext(const std::string& infoHash) const infoHash) { return (*i).second->downloadContext; } - } + } return getNull(); } diff --git a/src/BtSeederStateChoke.cc b/src/BtSeederStateChoke.cc index 152421fc..cf73e8b1 100644 --- a/src/BtSeederStateChoke.cc +++ b/src/BtSeederStateChoke.cc @@ -174,13 +174,13 @@ BtSeederStateChoke::executeChoke std::transform(peerSet.begin(), peerSet.end(), std::back_inserter(peerEntries), GenPeerEntry()); - + peerEntries.erase(std::remove_if(peerEntries.begin(), peerEntries.end(), NotInterestedPeer()), peerEntries.end()); unchoke(peerEntries); - + if(++round_ == 3) { round_ = 0; } diff --git a/src/BtSeederStateChoke.h b/src/BtSeederStateChoke.h index 13e869f2..0ba11da6 100644 --- a/src/BtSeederStateChoke.h +++ b/src/BtSeederStateChoke.h @@ -59,7 +59,7 @@ private: Timer lastAmUnchoking_; bool recentUnchoking_; int uploadSpeed_; - + const static time_t TIME_FRAME = 20; public: PeerEntry(const SharedHandle& peer); diff --git a/src/BtSetup.cc b/src/BtSetup.cc index cd975762..128a3510 100644 --- a/src/BtSetup.cc +++ b/src/BtSetup.cc @@ -114,7 +114,7 @@ void BtSetup::setup(std::vector& commands, c->setPieceStorage(pieceStorage); c->setBtRuntime(btRuntime); c->setBtAnnounce(btAnnounce); - + commands.push_back(c); } if(!metadataGetMode) { @@ -122,7 +122,7 @@ void BtSetup::setup(std::vector& commands, new PeerChokeCommand(e->newCUID(), e); c->setPeerStorage(peerStorage); c->setBtRuntime(btRuntime); - + commands.push_back(c); } { @@ -133,7 +133,7 @@ void BtSetup::setup(std::vector& commands, c->setPieceStorage(pieceStorage); c->setPeerStorage(peerStorage); c->setBtAnnounce(btAnnounce); - + commands.push_back(c); } @@ -261,7 +261,7 @@ void BtSetup::setup(std::vector& commands, if(btReg->getLpdMessageReceiver()) { const unsigned char* infoHash = bittorrent::getInfoHash(requestGroup->getDownloadContext()); - A2_LOG_INFO("Initializing LpdMessageDispatcher."); + A2_LOG_INFO("Initializing LpdMessageDispatcher."); SharedHandle dispatcher (new LpdMessageDispatcher (std::string(&infoHash[0], &infoHash[INFO_HASH_LENGTH]), diff --git a/src/BtStopDownloadCommand.h b/src/BtStopDownloadCommand.h index e92fc218..156ded76 100644 --- a/src/BtStopDownloadCommand.h +++ b/src/BtStopDownloadCommand.h @@ -49,7 +49,7 @@ class BtRuntime; class BtStopDownloadCommand:public TimeBasedCommand { private: RequestGroup* requestGroup_; - + time_t timeout_; Timer checkPoint_; diff --git a/src/Checksum.cc b/src/Checksum.cc index d1c32bf2..66c2f0f9 100644 --- a/src/Checksum.cc +++ b/src/Checksum.cc @@ -59,7 +59,7 @@ void Checksum::setDigest(const std::string& digest) { digest_ = digest; } - + void Checksum::setHashType(const std::string& hashType) { hashType_ = hashType; diff --git a/src/Checksum.h b/src/Checksum.h index 5fcf3182..147a3c09 100644 --- a/src/Checksum.h +++ b/src/Checksum.h @@ -58,7 +58,7 @@ public: { return digest_; } - + void setHashType(const std::string& type); const std::string& getHashType() const { diff --git a/src/ChunkChecksum.h b/src/ChunkChecksum.h index 3e1e3109..965840d1 100644 --- a/src/ChunkChecksum.h +++ b/src/ChunkChecksum.h @@ -65,7 +65,7 @@ public: size_t countPieceHash() const; const std::string& getPieceHash(size_t index) const; - + void setPieceHashes(const std::vector& pieceHashes); const std::vector& getPieceHashes() const { diff --git a/src/ChunkedDecodingStreamFilter.h b/src/ChunkedDecodingStreamFilter.h index a5ac2553..8aced1b3 100644 --- a/src/ChunkedDecodingStreamFilter.h +++ b/src/ChunkedDecodingStreamFilter.h @@ -57,7 +57,7 @@ public: (const SharedHandle& out, const SharedHandle& segment, const unsigned char* inbuf, size_t inlen); - + virtual bool finished(); virtual void release(); diff --git a/src/CookieStorage.cc b/src/CookieStorage.cc index 2acb353b..0fed673d 100644 --- a/src/CookieStorage.cc +++ b/src/CookieStorage.cc @@ -417,7 +417,7 @@ bool CookieStorage::saveNsFormat(const std::string& filename) if(fp.close() == EOF) { A2_LOG_ERROR(fmt("Failed to save cookies to %s", filename.c_str())); return false; - } + } } if(File(tempfilename).renameTo(filename)) { return true; diff --git a/src/CookieStorage.h b/src/CookieStorage.h index e397fa81..9febfad2 100644 --- a/src/CookieStorage.h +++ b/src/CookieStorage.h @@ -157,7 +157,7 @@ public: // method returns true. Otherwise, this method returns false. now // is used as creation time and last access time. bool load(const std::string& filename, time_t now); - + // Saves Cookies in Netspace format which is used in // Firefox1.2/Netscape/Mozilla. If Cookies are successfully saved, // this method returns true, otherwise returns false. @@ -165,7 +165,7 @@ public: // Returns the number of cookies this object stores. size_t size() const; - + // Returns true if this object contains a cookie x where x == cookie // satisfies. bool contains(const Cookie& cookie) const; diff --git a/src/DHTAbstractMessage.h b/src/DHTAbstractMessage.h index 82b65e72..33f098fc 100644 --- a/src/DHTAbstractMessage.h +++ b/src/DHTAbstractMessage.h @@ -83,7 +83,7 @@ public: } void setMessageDispatcher(DHTMessageDispatcher* dispatcher); - + DHTMessageFactory* getMessageFactory() const { return factory_; diff --git a/src/DHTAbstractNodeLookupTask.h b/src/DHTAbstractNodeLookupTask.h index cf71470e..75994923 100644 --- a/src/DHTAbstractNodeLookupTask.h +++ b/src/DHTAbstractNodeLookupTask.h @@ -68,9 +68,9 @@ private: unsigned char targetID_[DHT_ID_LENGTH]; std::deque > entries_; - + size_t inFlightMessage_; - + template void toEntries (Container& entries, const std::vector >& nodes) const @@ -130,12 +130,12 @@ protected: virtual void getNodesFromMessage (std::vector >& nodes, const ResponseMessage* message) = 0; - + virtual void onReceivedInternal (const ResponseMessage* message) {} - + virtual bool needsAdditionalOutgoingMessage() { return true; } - + virtual void onFinish() {} virtual SharedHandle createMessage diff --git a/src/DHTAbstractTask.h b/src/DHTAbstractTask.h index e6b24049..3e20c7bd 100644 --- a/src/DHTAbstractTask.h +++ b/src/DHTAbstractTask.h @@ -51,7 +51,7 @@ class DHTTaskQueue; class DHTAbstractTask:public DHTTask { private: bool finished_; - + SharedHandle localNode_; DHTRoutingTable* routingTable_; @@ -59,7 +59,7 @@ private: DHTMessageDispatcher* dispatcher_; DHTMessageFactory* factory_; - + DHTTaskQueue* taskQueue_; protected: void setFinished(bool f) diff --git a/src/DHTAnnouncePeerMessage.h b/src/DHTAnnouncePeerMessage.h index ab2c7716..b4fc6879 100644 --- a/src/DHTAnnouncePeerMessage.h +++ b/src/DHTAnnouncePeerMessage.h @@ -70,7 +70,7 @@ public: virtual void doReceivedAction(); virtual SharedHandle getArgument(); - + virtual const std::string& getMessageType() const; virtual void validate() const; diff --git a/src/DHTAutoSaveCommand.h b/src/DHTAutoSaveCommand.h index c17f1e47..b5663061 100644 --- a/src/DHTAutoSaveCommand.h +++ b/src/DHTAutoSaveCommand.h @@ -49,7 +49,7 @@ private: int family_; SharedHandle localNode_; - + SharedHandle routingTable_; void save(); diff --git a/src/DHTBucket.cc b/src/DHTBucket.cc index 3e2f62bb..a84e76a8 100644 --- a/src/DHTBucket.cc +++ b/src/DHTBucket.cc @@ -202,7 +202,7 @@ SharedHandle DHTBucket::split() assert(rBucket->addNode(*i)); } else { lNodes.push_back(*i); - } + } } nodes_ = lNodes; // TODO create toString() and use it. @@ -220,7 +220,7 @@ SharedHandle DHTBucket::split() void DHTBucket::getGoodNodes (std::vector >& goodNodes) const { - goodNodes.insert(goodNodes.end(), nodes_.begin(), nodes_.end()); + goodNodes.insert(goodNodes.end(), nodes_.begin(), nodes_.end()); goodNodes.erase(std::remove_if(goodNodes.begin(), goodNodes.end(), mem_fun_sh(&DHTNode::isBad)), goodNodes.end()); } diff --git a/src/DHTBucket.h b/src/DHTBucket.h index 0f4cbceb..6c1d6a5b 100644 --- a/src/DHTBucket.h +++ b/src/DHTBucket.h @@ -97,7 +97,7 @@ public: void cacheNode(const SharedHandle& node); bool splitAllowed() const; - + size_t getPrefixLength() const { return prefixLength_; diff --git a/src/DHTConnectionImpl.h b/src/DHTConnectionImpl.h index a8da33b5..91875e05 100644 --- a/src/DHTConnectionImpl.h +++ b/src/DHTConnectionImpl.h @@ -61,7 +61,7 @@ public: * given, the socket is associated to the address. */ bool bind(uint16_t& port, const std::string& addr, SegList& sgl); - + /** * Binds port. The port number specified by port is used to bind. * If successful, the binded port is assigned to port and returns diff --git a/src/DHTEntryPointNameResolveCommand.cc b/src/DHTEntryPointNameResolveCommand.cc index ed4b2d02..87d3e3b6 100644 --- a/src/DHTEntryPointNameResolveCommand.cc +++ b/src/DHTEntryPointNameResolveCommand.cc @@ -128,7 +128,7 @@ bool DHTEntryPointNameResolveCommand::execute() try { std::vector addrs; res.resolve(addrs, hostname); - + std::pair p(addrs.front(), entryPoints_.front().second); resolvedEntryPoints_.push_back(p); @@ -156,7 +156,7 @@ void DHTEntryPointNameResolveCommand::addPingTask SharedHandle entryNode(new DHTNode()); entryNode->setIPAddress(addr.first); entryNode->setPort(addr.second); - + taskQueue_->addPeriodicTask1(taskFactory_->createPingTask(entryNode, 10)); } diff --git a/src/DHTFindNodeMessage.h b/src/DHTFindNodeMessage.h index f6458fb5..431756f2 100644 --- a/src/DHTFindNodeMessage.h +++ b/src/DHTFindNodeMessage.h @@ -56,7 +56,7 @@ public: virtual void doReceivedAction(); virtual SharedHandle getArgument(); - + virtual const std::string& getMessageType() const; const unsigned char* getTargetNodeID() const diff --git a/src/DHTFindNodeReplyMessage.h b/src/DHTFindNodeReplyMessage.h index 1fabdf62..91f59514 100644 --- a/src/DHTFindNodeReplyMessage.h +++ b/src/DHTFindNodeReplyMessage.h @@ -58,7 +58,7 @@ public: virtual void doReceivedAction(); virtual SharedHandle getResponse(); - + virtual const std::string& getMessageType() const; virtual void accept(DHTMessageCallback* callback); @@ -72,9 +72,9 @@ public: (const std::vector >& closestKNodes); static const std::string FIND_NODE; - + static const std::string NODES; - + static const std::string NODES6; }; diff --git a/src/DHTGetPeersMessage.h b/src/DHTGetPeersMessage.h index 58443159..f6e808bd 100644 --- a/src/DHTGetPeersMessage.h +++ b/src/DHTGetPeersMessage.h @@ -64,7 +64,7 @@ public: virtual void doReceivedAction(); virtual SharedHandle getArgument(); - + virtual const std::string& getMessageType() const; const unsigned char* getInfoHash() const diff --git a/src/DHTGetPeersReplyMessage.h b/src/DHTGetPeersReplyMessage.h index 845d5a19..045abc81 100644 --- a/src/DHTGetPeersReplyMessage.h +++ b/src/DHTGetPeersReplyMessage.h @@ -93,7 +93,7 @@ public: { values_ = peers; } - + const std::string& getToken() const { return token_; diff --git a/src/DHTMessage.h b/src/DHTMessage.h index fec06250..5a50e801 100644 --- a/src/DHTMessage.h +++ b/src/DHTMessage.h @@ -86,7 +86,7 @@ public: virtual bool isReply() const = 0; virtual void validate() const {} - + virtual const std::string& getMessageType() const = 0; virtual std::string toString() const = 0; diff --git a/src/DHTMessageFactoryImpl.h b/src/DHTMessageFactoryImpl.h index 348ad30f..87738b44 100644 --- a/src/DHTMessageFactoryImpl.h +++ b/src/DHTMessageFactoryImpl.h @@ -157,7 +157,7 @@ public: void setConnection(DHTConnection* connection); void setMessageDispatcher(DHTMessageDispatcher* dispatcher); - + void setPeerAnnounceStorage(DHTPeerAnnounceStorage* storage); void setTokenTracker(DHTTokenTracker* tokenTracker); diff --git a/src/DHTMessageReceiver.h b/src/DHTMessageReceiver.h index 8a652c2d..4e2e15fe 100644 --- a/src/DHTMessageReceiver.h +++ b/src/DHTMessageReceiver.h @@ -66,7 +66,7 @@ private: void onMessageReceived(const SharedHandle& message); public: DHTMessageReceiver(const SharedHandle& tracker); - + ~DHTMessageReceiver(); SharedHandle receiveMessage(); diff --git a/src/DHTMessageTracker.h b/src/DHTMessageTracker.h index fae30052..c6ac66b1 100644 --- a/src/DHTMessageTracker.h +++ b/src/DHTMessageTracker.h @@ -56,7 +56,7 @@ class DHTMessageTrackerEntry; class DHTMessageTracker { private: std::deque > entries_; - + SharedHandle routingTable_; SharedHandle factory_; diff --git a/src/DHTMessageTrackerEntry.h b/src/DHTMessageTrackerEntry.h index d9c7f96d..7674e186 100644 --- a/src/DHTMessageTrackerEntry.h +++ b/src/DHTMessageTrackerEntry.h @@ -56,7 +56,7 @@ private: std::string transactionID_; std::string messageType_; - + SharedHandle callback_; Timer dispatchedTime_; @@ -89,7 +89,7 @@ public: const SharedHandle& getCallback() const { return callback_; - } + } int64_t getElapsedMillis() const; }; diff --git a/src/DHTNode.h b/src/DHTNode.h index e6c3bcc9..303b23c8 100644 --- a/src/DHTNode.h +++ b/src/DHTNode.h @@ -61,14 +61,14 @@ private: Timer lastContact_; public: DHTNode(); - + /** * id must be 20 bytes length */ DHTNode(const unsigned char* id); ~DHTNode(); - + void generateID(); const unsigned char* getID() const diff --git a/src/DHTPeerAnnounceEntry.h b/src/DHTPeerAnnounceEntry.h index bf03ea72..427720ab 100644 --- a/src/DHTPeerAnnounceEntry.h +++ b/src/DHTPeerAnnounceEntry.h @@ -72,7 +72,7 @@ public: } void removeStalePeerAddrEntry(time_t timeout); - + bool empty() const; const Timer& getLastUpdated() const diff --git a/src/DHTPeerAnnounceStorage.cc b/src/DHTPeerAnnounceStorage.cc index b72e198d..3a7cee9c 100644 --- a/src/DHTPeerAnnounceStorage.cc +++ b/src/DHTPeerAnnounceStorage.cc @@ -92,7 +92,7 @@ DHTPeerAnnounceStorage::addPeerAnnounce(const unsigned char* infoHash, bool DHTPeerAnnounceStorage::contains(const unsigned char* infoHash) const { SharedHandle entry(new DHTPeerAnnounceEntry(infoHash)); - return + return std::binary_search(entries_.begin(), entries_.end(), entry, InfoHashLess()); } diff --git a/src/DHTPeerLookupTask.cc b/src/DHTPeerLookupTask.cc index 0beaf998..3c0b9eaa 100644 --- a/src/DHTPeerLookupTask.cc +++ b/src/DHTPeerLookupTask.cc @@ -69,7 +69,7 @@ DHTPeerLookupTask::getNodesFromMessage message->getClosestKNodes(); nodes.insert(nodes.end(), knodes.begin(), knodes.end()); } - + void DHTPeerLookupTask::onReceivedInternal (const DHTGetPeersReplyMessage* message) { @@ -80,7 +80,7 @@ void DHTPeerLookupTask::onReceivedInternal A2_LOG_INFO(fmt("Received %lu peers.", static_cast(message->getValues().size()))); } - + SharedHandle DHTPeerLookupTask::createMessage (const SharedHandle& remoteNode) { diff --git a/src/DHTPeerLookupTask.h b/src/DHTPeerLookupTask.h index e80bbe59..1f444878 100644 --- a/src/DHTPeerLookupTask.h +++ b/src/DHTPeerLookupTask.h @@ -60,9 +60,9 @@ public: virtual void getNodesFromMessage (std::vector >& nodes, const DHTGetPeersReplyMessage* message); - + virtual void onReceivedInternal(const DHTGetPeersReplyMessage* message); - + virtual SharedHandle createMessage (const SharedHandle& remoteNode); diff --git a/src/DHTPingTask.h b/src/DHTPingTask.h index 63791afc..85681fbf 100644 --- a/src/DHTPingTask.h +++ b/src/DHTPingTask.h @@ -64,7 +64,7 @@ public: void onReceived(const DHTPingReplyMessage* message); - void onTimeout(const SharedHandle& node); + void onTimeout(const SharedHandle& node); void setTimeout(time_t timeout) { diff --git a/src/DHTQueryMessage.h b/src/DHTQueryMessage.h index ff7a74e9..295c2992 100644 --- a/src/DHTQueryMessage.h +++ b/src/DHTQueryMessage.h @@ -56,7 +56,7 @@ public: virtual void fillMessage(Dict* msgDict); virtual SharedHandle getArgument() = 0; - + virtual bool isReply() const; virtual std::string toString() const; diff --git a/src/DHTReplaceNodeTask.h b/src/DHTReplaceNodeTask.h index 18e8f761..005696e4 100644 --- a/src/DHTReplaceNodeTask.h +++ b/src/DHTReplaceNodeTask.h @@ -64,7 +64,7 @@ public: void onReceived(const DHTPingReplyMessage* message); - void onTimeout(const SharedHandle& node); + void onTimeout(const SharedHandle& node); void setTimeout(time_t timeout) { diff --git a/src/DHTResponseMessage.h b/src/DHTResponseMessage.h index 6e7e6dc5..68eef0f8 100644 --- a/src/DHTResponseMessage.h +++ b/src/DHTResponseMessage.h @@ -58,7 +58,7 @@ public: virtual void fillMessage(Dict* msgDict); virtual SharedHandle getResponse() = 0; - + virtual bool isReply() const; virtual std::string toString() const; diff --git a/src/DHTRoutingTable.h b/src/DHTRoutingTable.h index 97cc4e58..d7fb0b6f 100644 --- a/src/DHTRoutingTable.h +++ b/src/DHTRoutingTable.h @@ -84,13 +84,13 @@ public: void moveBucketHead(const SharedHandle& node); void moveBucketTail(const SharedHandle& node); - + SharedHandle getBucketFor(const unsigned char* nodeID) const; SharedHandle getBucketFor(const SharedHandle& node) const; SharedHandle getNode(const unsigned char* id, const std::string& ipaddr, uint16_t port) const; - + void getBuckets(std::vector >& buckets) const; void setTaskQueue(const SharedHandle& taskQueue); diff --git a/src/DHTRoutingTableDeserializer.cc b/src/DHTRoutingTableDeserializer.cc index 4bab77ce..f580415c 100644 --- a/src/DHTRoutingTableDeserializer.cc +++ b/src/DHTRoutingTableDeserializer.cc @@ -125,7 +125,7 @@ void DHTRoutingTableDeserializer::deserialize(const std::string& filename) filename.c_str(), "bad header")); } - + uint32_t temp32; uint64_t temp64; // time @@ -138,7 +138,7 @@ void DHTRoutingTableDeserializer::deserialize(const std::string& filename) READ_CHECK(fp, &temp64, sizeof(temp64)); serializedTime_.setTimeInSec(ntoh64(temp64)); } - + // localnode // 8bytes reserved readBytes(fp, buf, buf.size(), 8); diff --git a/src/DHTRoutingTableSerializer.cc b/src/DHTRoutingTableSerializer.cc index ba196cdc..2aa76a78 100644 --- a/src/DHTRoutingTableSerializer.cc +++ b/src/DHTRoutingTableSerializer.cc @@ -95,7 +95,7 @@ void DHTRoutingTableSerializer::serialize(const std::string& filename) // version header[6] = 0; header[7] = 0x03u; - + char zero[18]; memset(zero, 0, sizeof(zero)); diff --git a/src/DHTTaskFactory.h b/src/DHTTaskFactory.h index d943022f..90434696 100644 --- a/src/DHTTaskFactory.h +++ b/src/DHTTaskFactory.h @@ -63,7 +63,7 @@ public: createPeerLookupTask(const SharedHandle& ctx, uint16_t tcpPort, const SharedHandle& peerStorage) = 0; - + virtual SharedHandle createPeerAnnounceTask(const unsigned char* infoHash) = 0; diff --git a/src/DHTTaskFactoryImpl.h b/src/DHTTaskFactoryImpl.h index d383cf18..aef197f2 100644 --- a/src/DHTTaskFactoryImpl.h +++ b/src/DHTTaskFactoryImpl.h @@ -56,7 +56,7 @@ private: DHTMessageDispatcher* dispatcher_; DHTMessageFactory* factory_; - + DHTTaskQueue* taskQueue_; time_t timeout_; diff --git a/src/DNSCache.h b/src/DNSCache.h index 6efdba30..49606e62 100644 --- a/src/DNSCache.h +++ b/src/DNSCache.h @@ -88,7 +88,7 @@ private: if((*i).good_) { *out++ = (*i).addr_; } - } + } } void markBad(const std::string& addr); @@ -109,7 +109,7 @@ public: DNSCache& operator=(const DNSCache& c); const std::string& find(const std::string& hostname, uint16_t port) const; - + template void findAll (OutputIterator out, const std::string& hostname, uint16_t port) const diff --git a/src/DefaultBtInteractive.cc b/src/DefaultBtInteractive.cc index 8c3a5f24..ad1119b9 100644 --- a/src/DefaultBtInteractive.cc +++ b/src/DefaultBtInteractive.cc @@ -132,7 +132,7 @@ SharedHandle DefaultBtInteractive::receiveHandshake(bool quickReply) } peer_->setPeerId(message->getPeerId()); - + if(message->isFastExtensionSupported()) { peer_->setFastExtensionEnabled(true); A2_LOG_INFO(fmt(MSG_FAST_EXTENSION_ENABLED, cuid_)); @@ -367,7 +367,7 @@ void DefaultBtInteractive::fillPiece(size_t maxMissingBlock) { btRequestFactory_->getTargetPieceIndexes(excludedIndexes); pieceStorage_->getMissingPiece (pieces, diffMissingBlock, peer_, excludedIndexes, cuid_); - } else { + } else { pieces.reserve(diffMissingBlock); pieceStorage_->getMissingPiece(pieces, diffMissingBlock, peer_, cuid_); } @@ -568,7 +568,7 @@ size_t DefaultBtInteractive::countPendingMessage() { return dispatcher_->countMessageInQueue(); } - + bool DefaultBtInteractive::isSendingMessageInProgress() { return dispatcher_->isSendingInProgress(); diff --git a/src/DefaultBtInteractive.h b/src/DefaultBtInteractive.h index 706b1ddd..aec81816 100644 --- a/src/DefaultBtInteractive.h +++ b/src/DefaultBtInteractive.h @@ -68,7 +68,7 @@ private: int keepAliveCount; public: FloodingStat():chokeUnchokeCount(0), keepAliveCount(0) {} - + void incChokeUnchokeCount() { if(chokeUnchokeCount < INT_MAX) { chokeUnchokeCount++; @@ -184,7 +184,7 @@ public: size_t receiveMessages(); virtual size_t countPendingMessage(); - + virtual bool isSendingMessageInProgress(); virtual size_t countReceivedMessageInIteration() const; diff --git a/src/DefaultBtMessageDispatcher.cc b/src/DefaultBtMessageDispatcher.cc index 78df946c..cf686757 100644 --- a/src/DefaultBtMessageDispatcher.cc +++ b/src/DefaultBtMessageDispatcher.cc @@ -201,7 +201,7 @@ public: peer_(peer), pieceStorage_(pieceStorage) {} - + void operator()(const RequestSlot& slot) const { if(!peer_->isInPeerAllowedIndexSet(slot.getIndex())) { @@ -225,7 +225,7 @@ private: public: FindChokedRequestSlot(const SharedHandle& peer): peer_(peer) {} - + bool operator()(const RequestSlot& slot) const { return !peer_->isInPeerAllowedIndexSet(slot.getIndex()); diff --git a/src/DefaultBtProgressInfoFile.cc b/src/DefaultBtProgressInfoFile.cc index 0c670517..f064d3c7 100644 --- a/src/DefaultBtProgressInfoFile.cc +++ b/src/DefaultBtProgressInfoFile.cc @@ -206,7 +206,7 @@ void DefaultBtProgressInfoFile::save() // It is assumed that integers are saved as: // 1) host byte order if version == 0000 // 2) network byte order if version == 0001 -void DefaultBtProgressInfoFile::load() +void DefaultBtProgressInfoFile::load() { A2_LOG_INFO(fmt(MSG_LOADING_SEGMENT_FILE, filename_.c_str())); BufferedFile fp(filename_.c_str(), BufferedFile::READ); @@ -356,7 +356,7 @@ void DefaultBtProgressInfoFile::load() piece->setHashType(dctx_->getPieceHashType()); #endif // ENABLE_MESSAGE_DIGEST - + inFlightPieces.push_back(piece); } pieceStorage_->addInFlightPiece(inFlightPieces); diff --git a/src/DefaultPeerStorage.h b/src/DefaultPeerStorage.h index 8722e63b..4e43d966 100644 --- a/src/DefaultPeerStorage.h +++ b/src/DefaultPeerStorage.h @@ -114,7 +114,7 @@ public: virtual void executeChoke(); void deleteUnusedPeer(size_t delSize); - + void onErasingPeer(const SharedHandle& peer); void onReturningPeer(const SharedHandle& peer); diff --git a/src/DefaultPieceStorage.h b/src/DefaultPieceStorage.h index a469ee6e..1dd35c29 100644 --- a/src/DefaultPieceStorage.h +++ b/src/DefaultPieceStorage.h @@ -122,7 +122,7 @@ public: // priority. DefaultPieceStorage(const SharedHandle& downloadContext, const Option* option); - + virtual ~DefaultPieceStorage(); #ifdef ENABLE_BITTORRENT @@ -206,7 +206,7 @@ public: virtual void initStorage(); virtual void setupFileFilter(); - + virtual void clearFileFilter(); virtual bool downloadFinished(); @@ -215,7 +215,7 @@ public: virtual void setBitfield(const unsigned char* bitfield, size_t bitfieldLength); - + virtual size_t getBitfieldLength(); virtual const unsigned char* getBitfield(); @@ -234,7 +234,7 @@ public: { return endGame_; } - + virtual void enterEndGame() { endGame_ = true; @@ -270,7 +270,7 @@ public: virtual void addPieceStats(const unsigned char* bitfield, size_t bitfieldLength); - + virtual void subtractPieceStats(const unsigned char* bitfield, size_t bitfieldLength); diff --git a/src/DownloadContext.h b/src/DownloadContext.h index faca8174..c05f4bcd 100644 --- a/src/DownloadContext.h +++ b/src/DownloadContext.h @@ -76,7 +76,7 @@ private: bool knowsTotalLength_; RequestGroup* ownerRequestGroup_; - + std::vector > attrs_; Timer downloadStartTime_; @@ -99,7 +99,7 @@ public: ~DownloadContext(); const std::string& getPieceHash(size_t index) const; - + const std::vector& getPieceHashes() const { return pieceHashes_; @@ -219,7 +219,7 @@ public: } int64_t calculateSessionTime() const; - + // Returns FileEntry at given offset. SharedHandle() is // returned if no such FileEntry is found. SharedHandle findFileEntryByOffset(int64_t offset) const; diff --git a/src/DownloadEngine.h b/src/DownloadEngine.h index cbea65ec..05a8b03a 100644 --- a/src/DownloadEngine.h +++ b/src/DownloadEngine.h @@ -115,7 +115,7 @@ private: // key = IP address:port, value = SocketPoolEntry std::multimap socketPool_; - + Timer lastSocketPoolScan_; bool noWait_; @@ -151,7 +151,7 @@ private: void onEndOfRun(); void afterEachIteration(); - + void poolSocket(const std::string& key, const SocketPoolEntry& entry); std::multimap::iterator @@ -162,7 +162,7 @@ private: SharedHandle fileAllocationMan_; SharedHandle checkIntegrityMan_; Option* option_; -public: +public: DownloadEngine(const SharedHandle& eventPoll); ~DownloadEngine(); diff --git a/src/EpollEventPoll.cc b/src/EpollEventPoll.cc index f7bbea59..75408037 100644 --- a/src/EpollEventPoll.cc +++ b/src/EpollEventPoll.cc @@ -159,7 +159,7 @@ int translateEvents(EventPoll::EventType events) newEvents |= EPOLLERR; } if(EventPoll::EVENT_HUP&events) { - newEvents |= EPOLLHUP; + newEvents |= EPOLLHUP; } return newEvents; } diff --git a/src/Event.h b/src/Event.h index b538c47e..2cf6c0ac 100644 --- a/src/Event.h +++ b/src/Event.h @@ -78,7 +78,7 @@ public: { return command_; } - + void addEvents(int events) { events_ |= events; @@ -86,14 +86,14 @@ public: void removeEvents(int events) { - events_ &= (~events); + events_ &= (~events); } bool eventsEmpty() const { return events_ == 0; } - + bool operator==(const CommandEvent& commandEvent) const { return command_ == commandEvent.command_; @@ -134,7 +134,7 @@ public: socketEntry->removeCommandEvent(*this); } }; - + #ifdef ENABLE_ASYNC_DNS template @@ -153,7 +153,7 @@ public: { return *resolver_ == *event.resolver_; } - + virtual int getEvents() const { return events_; @@ -198,11 +198,11 @@ template class SocketEntry { protected: sock_t socket_; - + std::deque commandEvents_; - + #ifdef ENABLE_ASYNC_DNS - + std::deque adnsEvents_; #endif // ENABLE_ASYNC_DNS @@ -247,7 +247,7 @@ public: } #ifdef ENABLE_ASYNC_DNS - + void addADNSEvent(const ADNSEvent& aev) { typename std::deque::iterator i = @@ -287,7 +287,7 @@ public: return commandEvents_.empty(); #endif // !ENABLE_ASYNC_DNS) } - + void processEvents(int events) { std::for_each(commandEvents_.begin(), commandEvents_.end(), @@ -313,7 +313,7 @@ private: Command* command_; size_t socketsSize_; - + sock_t sockets_[ARES_GETSOCK_MAXNUM]; public: @@ -358,7 +358,7 @@ public: } socketsSize_ = i; } - + void removeSocketEvents(EventPoll* e) { for(size_t i = 0; i < socketsSize_; ++i) { diff --git a/src/Exception.h b/src/Exception.h index bf549a64..e8fb76cb 100644 --- a/src/Exception.h +++ b/src/Exception.h @@ -47,7 +47,7 @@ namespace aria2 { class Exception:public std::exception { private: const char* file_; - + int line_; // This is low-level system error code, typically errno in Linux. int errNum_; diff --git a/src/FatalException.cc b/src/FatalException.cc index b4c60f7f..e8b19687 100644 --- a/src/FatalException.cc +++ b/src/FatalException.cc @@ -45,7 +45,7 @@ SharedHandle FatalException::copy() const FatalException::FatalException (const char* file, int line, const std::string& msg): Exception(file, line, msg) {} - + FatalException::FatalException (const char* file, int line, const std::string& msg, const Exception& cause): diff --git a/src/FeedbackURISelector.cc b/src/FeedbackURISelector.cc index 6445e9eb..b6bf9a94 100644 --- a/src/FeedbackURISelector.cc +++ b/src/FeedbackURISelector.cc @@ -77,7 +77,7 @@ std::string FeedbackURISelector::select if(uri.empty()) { A2_LOG_DEBUG("No URI returned from selectFaster()"); uri = selectRarer(fileEntry->getRemainingUris(), usedHosts); - } + } if(!uri.empty()) { std::deque& uris = fileEntry->getRemainingUris(); uris.erase(std::find(uris.begin(), uris.end(), uri)); diff --git a/src/File.h b/src/File.h index d5489e72..9fa1264c 100644 --- a/src/File.h +++ b/src/File.h @@ -50,7 +50,7 @@ namespace aria2 { class File { private: std::string name_; - + /** * Returns the return value of stat(...) */ diff --git a/src/FileAllocationCommand.cc b/src/FileAllocationCommand.cc index 10c605ed..5486503a 100644 --- a/src/FileAllocationCommand.cc +++ b/src/FileAllocationCommand.cc @@ -73,7 +73,7 @@ bool FileAllocationCommand::executeInternal() static_cast(timer_.difference(global::wallclock())), getRequestGroup()->getTotalLength())); getDownloadEngine()->getFileAllocationMan()->dropPickedEntry(); - + std::vector* commands = new std::vector(); auto_delete_container > commandsDel(commands); fileAllocationEntry_->prepareForNextAction(*commands, getDownloadEngine()); diff --git a/src/FtpConnection.cc b/src/FtpConnection.cc index ff7e9e2c..9531b7ef 100644 --- a/src/FtpConnection.cc +++ b/src/FtpConnection.cc @@ -333,7 +333,7 @@ FtpConnection::findEndOfResponse bool FtpConnection::bulkReceiveResponse(std::pair& response) { - char buf[1024]; + char buf[1024]; while(1) { size_t size = sizeof(buf); socket_->readData(buf, size); diff --git a/src/FtpInitiateConnectionCommand.cc b/src/FtpInitiateConnectionCommand.cc index 0ba6c197..374bfccb 100644 --- a/src/FtpInitiateConnectionCommand.cc +++ b/src/FtpInitiateConnectionCommand.cc @@ -95,7 +95,7 @@ Command* FtpInitiateConnectionCommand::createNextCommand getCuid(), addr.c_str(), port)); createSocket(); getSocket()->establishConnection(addr, port); - + getRequest()->setConnectedAddrInfo(hostname, addr, port); if(proxyMethod == V_GET) { // Use GET for FTP via HTTP proxy. @@ -104,7 +104,7 @@ Command* FtpInitiateConnectionCommand::createNextCommand (new SocketRecvBuffer(getSocket())); SharedHandle hc (new HttpConnection(getCuid(), getSocket(), socketRecvBuffer)); - + HttpRequestCommand* c = new HttpRequestCommand(getCuid(), getRequest(), getFileEntry(), getRequestGroup(), hc, getDownloadEngine(), @@ -138,7 +138,7 @@ Command* FtpInitiateConnectionCommand::createNextCommand (new SocketRecvBuffer(pooledSocket)); SharedHandle hc (new HttpConnection(getCuid(), pooledSocket, socketRecvBuffer)); - + HttpRequestCommand* c = new HttpRequestCommand(getCuid(), getRequest(), getFileEntry(), getRequestGroup(), hc, getDownloadEngine(), diff --git a/src/FtpNegotiationCommand.cc b/src/FtpNegotiationCommand.cc index 42a10a7b..a4188c51 100644 --- a/src/FtpNegotiationCommand.cc +++ b/src/FtpNegotiationCommand.cc @@ -273,7 +273,7 @@ bool FtpNegotiationCommand::recvPwd() bool FtpNegotiationCommand::sendCwdPrep() { - // Calling setReadCheckSocket() is needed when the socket is reused, + // Calling setReadCheckSocket() is needed when the socket is reused, setReadCheckSocket(getSocket()); cwdDirs_.push_front(ftp_->getBaseWorkingDir()); util::split(getRequest()->getDir().begin(), getRequest()->getDir().end(), @@ -354,7 +354,7 @@ bool FtpNegotiationCommand::recvMdtm() getCuid())); } sequence_ = SEQ_SEND_SIZE; - return true; + return true; } bool FtpNegotiationCommand::sendSize() { @@ -702,7 +702,7 @@ bool FtpNegotiationCommand::resolveProxy() A2_LOG_INFO(fmt(MSG_CONNECTING_TO_SERVER, getCuid(), proxyAddr_.c_str(), proxyReq->getPort())); - dataSocket_.reset(new SocketCore()); + dataSocket_.reset(new SocketCore()); dataSocket_->establishConnection(proxyAddr_, proxyReq->getPort()); disableReadCheckSocket(); setWriteCheckSocket(dataSocket_); @@ -742,7 +742,7 @@ bool FtpNegotiationCommand::sendTunnelRequest() return false; } } - } + } SharedHandle httpRequest(new HttpRequest()); httpRequest->setUserAgent(getOption()->get(PREF_USER_AGENT)); SharedHandle req(new Request()); diff --git a/src/GZipDecodingStreamFilter.h b/src/GZipDecodingStreamFilter.h index 3fce057f..349bc8e5 100644 --- a/src/GZipDecodingStreamFilter.h +++ b/src/GZipDecodingStreamFilter.h @@ -72,7 +72,7 @@ public: { return bytesProcessed_; } - + static const std::string NAME; }; diff --git a/src/GrowSegment.h b/src/GrowSegment.h index c211e8f7..9014f321 100644 --- a/src/GrowSegment.h +++ b/src/GrowSegment.h @@ -62,7 +62,7 @@ public: { return 0; } - + virtual int64_t getPositionToWrite() const { return writtenLength_; diff --git a/src/HttpRequest.cc b/src/HttpRequest.cc index 6cb6c454..a816eb4b 100644 --- a/src/HttpRequest.cc +++ b/src/HttpRequest.cc @@ -195,13 +195,13 @@ std::string HttpRequest::createRequest() if(!request_->isKeepAliveEnabled() && !request_->isPipeliningEnabled()) { builtinHds.push_back(std::make_pair("Connection:", "close")); } - if(segment_ && segment_->getLength() > 0 && + if(segment_ && segment_->getLength() > 0 && (request_->isPipeliningEnabled() || getStartByte() > 0)) { std::string rangeHeader(fmt("bytes=%" PRId64 "-", getStartByte())); if(request_->isPipeliningEnabled()) { rangeHeader += util::itos(getEndByte()); } else if(getProtocol() != "ftp" && endOffsetOverride_ > 0) { - // FTP via http proxy does not support endbytes + // FTP via http proxy does not support endbytes rangeHeader += util::itos(endOffsetOverride_-1); } builtinHds.push_back(std::make_pair("Range:", rangeHeader)); @@ -386,7 +386,7 @@ const std::string& HttpRequest::getCurrentURI() const { return request_->getCurrentUri(); } - + const std::string& HttpRequest::getDir() const { return request_->getDir(); diff --git a/src/HttpRequest.h b/src/HttpRequest.h index 76c954c9..2d355a64 100644 --- a/src/HttpRequest.h +++ b/src/HttpRequest.h @@ -56,7 +56,7 @@ class AuthConfig; class HttpRequest { private: - + static const std::string USER_AGENT; SharedHandle request_; @@ -117,7 +117,7 @@ public: const std::string& getProtocol() const; const std::string& getCurrentURI() const; - + const std::string& getDir() const; const std::string& getFile() const; @@ -165,7 +165,7 @@ public: void disableContentEncoding(); void setUserAgent(const std::string& userAgent); - + // accepts multiline headers, delimited by LF void addHeader(const std::string& headers); @@ -193,7 +193,7 @@ public: * object. */ void setProxyRequest(const SharedHandle& proxyRequest); - + /* * Returns true if non-Null proxy request is set by setProxyRequest(). * Otherwise, returns false. diff --git a/src/HttpResponse.h b/src/HttpResponse.h index ec286828..f23a92eb 100644 --- a/src/HttpResponse.h +++ b/src/HttpResponse.h @@ -60,7 +60,7 @@ private: SharedHandle httpHeader_; public: HttpResponse(); - + ~HttpResponse(); void validateResponse() const; diff --git a/src/HttpResponseCommand.cc b/src/HttpResponseCommand.cc index 761b6422..780209a4 100644 --- a/src/HttpResponseCommand.cc +++ b/src/HttpResponseCommand.cc @@ -558,7 +558,7 @@ HttpDownloadCommand* HttpResponseCommand::createHttpDownloadCommand command->installStreamFilter(filter); if(getRequestGroup()->isFileAllocationEnabled() && !decideFileAllocation(filter)) { - getRequestGroup()->setFileAllocationEnabled(false); + getRequestGroup()->setFileAllocationEnabled(false); } getRequestGroup()->getURISelector()->tuneDownloadCommand (getFileEntry()->getRemainingUris(), command); diff --git a/src/HttpServerResponseCommand.h b/src/HttpServerResponseCommand.h index 670dc286..2df208e0 100644 --- a/src/HttpServerResponseCommand.h +++ b/src/HttpServerResponseCommand.h @@ -52,6 +52,6 @@ public: virtual ~HttpServerResponseCommand(); }; -} // namespace aria2 +} // namespace aria2 #endif // D_HTTP_SERVER_RESPONSE_COMMAND_H diff --git a/src/HttpSkipResponseCommand.cc b/src/HttpSkipResponseCommand.cc index 131df34d..b236a01b 100644 --- a/src/HttpSkipResponseCommand.cc +++ b/src/HttpSkipResponseCommand.cc @@ -105,7 +105,7 @@ bool HttpSkipResponseCommand::executeInternal() // If request method is HEAD or content-length header is present and // it's value is 0, then pool socket for reuse. // If content-length header is not present, then EOF is expected in the end. - // In this case, the content is thrown away and socket cannot be pooled. + // In this case, the content is thrown away and socket cannot be pooled. if(getRequest()->getMethod() == Request::METHOD_HEAD || httpResponse_->getHttpHeader()->defined(HttpHeader::CONTENT_LENGTH)) { poolConnection(); diff --git a/src/InitiatorMSEHandshakeCommand.cc b/src/InitiatorMSEHandshakeCommand.cc index eec75444..a967ba59 100644 --- a/src/InitiatorMSEHandshakeCommand.cc +++ b/src/InitiatorMSEHandshakeCommand.cc @@ -84,7 +84,7 @@ InitiatorMSEHandshakeCommand::~InitiatorMSEHandshakeCommand() { requestGroup_->decreaseNumCommand(); btRuntime_->decreaseConnections(); - + delete mseHandshake_; } diff --git a/src/LibgcryptMessageDigestImpl.h b/src/LibgcryptMessageDigestImpl.h index 099eb030..1bec9154 100644 --- a/src/LibgcryptMessageDigestImpl.h +++ b/src/LibgcryptMessageDigestImpl.h @@ -63,7 +63,7 @@ public: static bool supports(const std::string& hashType); static size_t getDigestLength(const std::string& hashType); - + size_t getDigestLength() const; void reset(); void update(const void* data, size_t length); diff --git a/src/LibsslMessageDigestImpl.h b/src/LibsslMessageDigestImpl.h index 8fcd71e0..1557c4c2 100644 --- a/src/LibsslMessageDigestImpl.h +++ b/src/LibsslMessageDigestImpl.h @@ -63,7 +63,7 @@ public: static bool supports(const std::string& hashType); static size_t getDigestLength(const std::string& hashType); - + size_t getDigestLength() const; void reset(); void update(const void* data, size_t length); diff --git a/src/MSEHandshake.cc b/src/MSEHandshake.cc index 9e5b8a35..6e34ae30 100644 --- a/src/MSEHandshake.cc +++ b/src/MSEHandshake.cc @@ -190,7 +190,7 @@ void MSEHandshake::initCipher(const unsigned char* infoHash) memcpy(s, initiator_?"keyA":"keyB", 4); memcpy(s+4, secret_, KEY_LENGTH); memcpy(s+4+KEY_LENGTH, infoHash, INFO_HASH_LENGTH); - + unsigned char localCipherKey[20]; sha1_->reset(); message_digest::digest(localCipherKey, sizeof(localCipherKey), @@ -252,7 +252,7 @@ void MSEHandshake::createReq23Hash(unsigned char* md, const unsigned char* infoH unsigned char yh[20]; sha1_->reset(); message_digest::digest(yh, sizeof(yh), sha1_, y, sizeof(y)); - + for(size_t i = 0; i < 20; ++i) { md[i] = xh[i]^yh[i]; } diff --git a/src/MSEHandshake.h b/src/MSEHandshake.h index aa8aaf77..be29e29f 100644 --- a/src/MSEHandshake.h +++ b/src/MSEHandshake.h @@ -126,7 +126,7 @@ public: const Option* op); ~MSEHandshake(); - + HANDSHAKE_TYPE identifyHandshakeType(); void initEncryptionFacility(bool initiator); diff --git a/src/MetadataInfo.h b/src/MetadataInfo.h index 2774cce9..482a82dc 100644 --- a/src/MetadataInfo.h +++ b/src/MetadataInfo.h @@ -68,7 +68,7 @@ public: { return id_; } - + static int64_t genId(); }; diff --git a/src/MetalinkEntry.h b/src/MetalinkEntry.h index bb43ae92..fa15aaac 100644 --- a/src/MetalinkEntry.h +++ b/src/MetalinkEntry.h @@ -91,7 +91,7 @@ public: void reorderResourcesByPriority(); void reorderMetaurlsByPriority(); - + bool containsLanguage(const std::string& lang) const; bool containsOS(const std::string& os) const; diff --git a/src/MetalinkParserController.cc b/src/MetalinkParserController.cc index 0f0de916..ee0abcab 100644 --- a/src/MetalinkParserController.cc +++ b/src/MetalinkParserController.cc @@ -368,7 +368,7 @@ void MetalinkParserController::addHashOfChunkChecksumV4(const std::string& md) } else { cancelChunkChecksumTransactionV4(); } -#endif // ENABLE_MESSAGE_DIGEST +#endif // ENABLE_MESSAGE_DIGEST } void MetalinkParserController::commitChunkChecksumTransactionV4() diff --git a/src/MetalinkParserState.h b/src/MetalinkParserState.h index f75c1137..844597f4 100644 --- a/src/MetalinkParserState.h +++ b/src/MetalinkParserState.h @@ -56,7 +56,7 @@ public: const char* prefix, const char* nsUri, const std::vector& attrs) {} - + virtual void endElement (MetalinkParserStateMachine* stm, const char* localname, diff --git a/src/MetalinkParserStateMachine.cc b/src/MetalinkParserStateMachine.cc index c4c18e21..bcca4410 100644 --- a/src/MetalinkParserStateMachine.cc +++ b/src/MetalinkParserStateMachine.cc @@ -519,7 +519,7 @@ void MetalinkParserStateMachine::beginElement { stateStack_.top()->beginElement(this, localname, prefix, nsUri, attrs); } - + void MetalinkParserStateMachine::endElement (const char* localname, const char* prefix, diff --git a/src/MetalinkParserStateMachine.h b/src/MetalinkParserStateMachine.h index f74fc304..8beed5ea 100644 --- a/src/MetalinkParserStateMachine.h +++ b/src/MetalinkParserStateMachine.h @@ -60,7 +60,7 @@ private: static MetalinkParserState* initialState_; static MetalinkParserState* skipTagState_; - + // Metalink3 static MetalinkParserState* metalinkState_; static MetalinkParserState* filesState_; // Metalink3Spec @@ -126,7 +126,7 @@ public: void setVersionState(); void setLanguageState(); - + void setOSState(); void setVerificationState(); // Metalink3Spec diff --git a/src/MultiDiskAdaptor.cc b/src/MultiDiskAdaptor.cc index 6397a019..a9ea7172 100644 --- a/src/MultiDiskAdaptor.cc +++ b/src/MultiDiskAdaptor.cc @@ -133,7 +133,7 @@ SharedHandle createDiskWriterEntry SharedHandle entry(new DiskWriterEntry(fileEntry)); entry->needsFileAllocation(needsFileAllocation); return entry; -} +} } // namespace void MultiDiskAdaptor::resetDiskWriterEntries() @@ -243,11 +243,11 @@ void MultiDiskAdaptor::openIfNot if(!entry->isOpen()) { // A2_LOG_DEBUG(fmt("DiskWriterEntry: Cache MISS. offset=%s", // util::itos(entry->getFileEntry()->getOffset()).c_str())); - + int numOpened = openedDiskWriterEntries_.size(); (entry.get()->*open)(); if(numOpened >= maxOpenFiles_) { - // Cache is full. + // Cache is full. // Choose one DiskWriterEntry randomly and close it. size_t index = SimpleRandomizer::getInstance()->getRandomNumber(numOpened); @@ -258,7 +258,7 @@ void MultiDiskAdaptor::openIfNot (*i) = entry; } else { openedDiskWriterEntries_.push_back(entry); - } + } } else { // A2_LOG_DEBUG(fmt("DiskWriterEntry: Cache HIT. offset=%s", // util::itos(entry->getFileEntry()->getOffset()).c_str())); @@ -360,7 +360,7 @@ void throwOnDiskWriterNotOpened(const SharedHandle& e, throw DL_ABORT_EX (fmt("DiskWriter for offset=%" PRId64 ", filename=%s is not opened.", static_cast(offset), - e->getFilePath().c_str())); + e->getFilePath().c_str())); } } // namespace diff --git a/src/MultiFileAllocationIterator.h b/src/MultiFileAllocationIterator.h index a0359e89..b61e3655 100644 --- a/src/MultiFileAllocationIterator.h +++ b/src/MultiFileAllocationIterator.h @@ -56,7 +56,7 @@ public: virtual ~MultiFileAllocationIterator(); virtual void allocateChunk(); - + virtual bool finished(); virtual int64_t getCurrentLength(); diff --git a/src/Netrc.cc b/src/Netrc.cc index 1d67f1bb..cbcfc063 100644 --- a/src/Netrc.cc +++ b/src/Netrc.cc @@ -205,7 +205,7 @@ void Netrc::parse(const std::string& path) skipMacdef(fp); } state = GET_TOKEN; - } + } } } if(state != GET_TOKEN) { diff --git a/src/Option.h b/src/Option.h index a1f71e90..51640b2b 100644 --- a/src/Option.h +++ b/src/Option.h @@ -66,7 +66,7 @@ public: int64_t getAsLLInt(const Pref* pref) const; bool getAsBool(const Pref* pref) const; double getAsDouble(const Pref* pref) const; - + void remove(const Pref* pref); void clear(); diff --git a/src/Peer.cc b/src/Peer.cc index 2a4948a4..caac3f43 100644 --- a/src/Peer.cc +++ b/src/Peer.cc @@ -152,7 +152,7 @@ void Peer::peerInterested(bool b) assert(res_); res_->peerInterested(b); } - + // this peer should be choked bool Peer::chokingRequired() const { diff --git a/src/Peer.h b/src/Peer.h index 0937ba97..f85c8f76 100644 --- a/src/Peer.h +++ b/src/Peer.h @@ -98,7 +98,7 @@ public: { return id_ == p.id_; } - + bool operator!=(const Peer& p) { return !(*this == p); @@ -201,7 +201,7 @@ public: bool peerInterested() const; void peerInterested(bool b); - + // this peer should be choked bool chokingRequired() const; @@ -240,7 +240,7 @@ public: * Returns the number of bytes downloaded from the remote host. */ int64_t getSessionDownloadLength() const; - + void setBitfield(const unsigned char* bitfield, size_t bitfieldLength); const unsigned char* getBitfield() const; @@ -254,7 +254,7 @@ public: * operation = 0: set index-th bit to 0 */ void updateBitfield(size_t index, int operation); - + void setFastExtensionEnabled(bool enabled); bool isFastExtensionEnabled() const; diff --git a/src/PeerAbstractCommand.cc b/src/PeerAbstractCommand.cc index d949fa12..6ae633d1 100644 --- a/src/PeerAbstractCommand.cc +++ b/src/PeerAbstractCommand.cc @@ -133,7 +133,7 @@ void PeerAbstractCommand::disableReadCheckSocket() e_->deleteSocketForReadCheck(readCheckTarget_, this); checkSocketIsReadable_ = false; readCheckTarget_.reset(); - } + } } void PeerAbstractCommand::setReadCheckSocket(const SharedHandle& socket) diff --git a/src/PeerAddrEntry.h b/src/PeerAddrEntry.h index d6690a6a..1b643d83 100644 --- a/src/PeerAddrEntry.h +++ b/src/PeerAddrEntry.h @@ -46,7 +46,7 @@ namespace aria2 { class PeerAddrEntry { private: std::string ipaddr_; - + uint16_t port_; Timer lastUpdated_; diff --git a/src/PeerInteractionCommand.cc b/src/PeerInteractionCommand.cc index d35e3bff..2a84d38d 100644 --- a/src/PeerInteractionCommand.cc +++ b/src/PeerInteractionCommand.cc @@ -113,7 +113,7 @@ PeerInteractionCommand::PeerInteractionCommand } else { family = AF_INET; } - + SharedHandle torrentAttrs = bittorrent::getTorrentAttrs(requestGroup_->getDownloadContext()); bool metadataGetMode = torrentAttrs->metadata.empty(); diff --git a/src/PeerListenCommand.h b/src/PeerListenCommand.h index 3a9d348d..e061bf54 100644 --- a/src/PeerListenCommand.h +++ b/src/PeerListenCommand.h @@ -53,7 +53,7 @@ public: PeerListenCommand(cuid_t cuid, DownloadEngine* e, int family); virtual ~PeerListenCommand(); - + virtual bool execute(); /** @@ -66,6 +66,6 @@ public: uint16_t getPort() const; }; -} // namespace aria2 +} // namespace aria2 #endif // D_PEER_LISTEN_COMMAND_H diff --git a/src/PeerReceiveHandshakeCommand.h b/src/PeerReceiveHandshakeCommand.h index dee52d18..4e8a199a 100644 --- a/src/PeerReceiveHandshakeCommand.h +++ b/src/PeerReceiveHandshakeCommand.h @@ -58,7 +58,7 @@ public: const SharedHandle& s, const SharedHandle& peerConnection = SharedHandle()); - + virtual ~PeerReceiveHandshakeCommand(); }; diff --git a/src/PeerSessionResource.cc b/src/PeerSessionResource.cc index 26dc3c24..2e0f4b88 100644 --- a/src/PeerSessionResource.cc +++ b/src/PeerSessionResource.cc @@ -89,7 +89,7 @@ void PeerSessionResource::peerInterested(bool b) { peerInterested_ = b; } - + void PeerSessionResource::chokingRequired(bool b) { chokingRequired_ = b; diff --git a/src/PeerSessionResource.h b/src/PeerSessionResource.h index c0d19261..84e7f537 100644 --- a/src/PeerSessionResource.h +++ b/src/PeerSessionResource.h @@ -119,7 +119,7 @@ public: } void peerInterested(bool b); - + // this peer should be choked bool chokingRequired() const { @@ -149,7 +149,7 @@ public: bool hasAllPieces() const; void updateBitfield(size_t index, int operation); - + void setBitfield(const unsigned char* bitfield, size_t bitfieldLength); const unsigned char* getBitfield() const; diff --git a/src/Piece.h b/src/Piece.h index ef6ac3ce..65fa4fca 100644 --- a/src/Piece.h +++ b/src/Piece.h @@ -74,7 +74,7 @@ private: Piece(const Piece& piece); - Piece& operator=(const Piece& piece); + Piece& operator=(const Piece& piece); public: static const int32_t BLOCK_LENGTH = 16*1024; diff --git a/src/PieceStatMan.h b/src/PieceStatMan.h index 32020ab2..96ea824b 100644 --- a/src/PieceStatMan.h +++ b/src/PieceStatMan.h @@ -56,7 +56,7 @@ public: void addPieceStats(const unsigned char* bitfield, size_t bitfieldLength); - + void subtractPieceStats(const unsigned char* bitfield, size_t bitfieldLength); diff --git a/src/PieceStorage.h b/src/PieceStorage.h index 57114dba..d6d99978 100644 --- a/src/PieceStorage.h +++ b/src/PieceStorage.h @@ -85,7 +85,7 @@ public: const SharedHandle& peer, const std::vector& excludedIndexes, cuid_t cuid) = 0; - + // Stores pieces that the peer has but localhost doesn't. Only // pieces that declared as "fast" are stored. Those pieces stored // will be marked "used" status in order to prevent other command @@ -188,9 +188,9 @@ public: virtual int64_t getFilteredCompletedLength() = 0; virtual void setupFileFilter() = 0; - + virtual void clearFileFilter() = 0; - + /** * Returns true if download has completed. * If file filter is enabled, then returns true if those files have @@ -214,7 +214,7 @@ public: virtual void setBitfield(const unsigned char* bitfield, size_t bitfieldLength) = 0; - + virtual size_t getBitfieldLength() = 0; virtual bool isSelectiveDownloadingMode() = 0; @@ -227,7 +227,7 @@ public: virtual void setEndGamePieceNum(size_t num) = 0; virtual SharedHandle getDiskAdaptor() = 0; - + virtual int32_t getPieceLength(size_t index) = 0; /** diff --git a/src/Platform.cc b/src/Platform.cc index cc343e20..a2749a4e 100644 --- a/src/Platform.cc +++ b/src/Platform.cc @@ -150,7 +150,7 @@ bool Platform::setUp() #ifdef __MINGW32__ unsigned int _CRT_fmode = _O_BINARY; #endif // __MINGW32__ - + return true; } @@ -172,7 +172,7 @@ bool Platform::tearDown() #ifdef HAVE_WINSOCK2_H WSACleanup(); #endif // HAVE_WINSOCK2_H - + return true; } diff --git a/src/PollEventPoll.cc b/src/PollEventPoll.cc index ac8bf6aa..ba4f479b 100644 --- a/src/PollEventPoll.cc +++ b/src/PollEventPoll.cc @@ -163,7 +163,7 @@ bool PollEventPoll::addEvents break; } } - } else { + } else { socketEntries_.insert(i, socketEntry); event.addSelf(socketEntry); if(pollfdCapacity_ == pollfdNum_) { diff --git a/src/Request.cc b/src/Request.cc index eeedb170..d8d2e02e 100644 --- a/src/Request.cc +++ b/src/Request.cc @@ -162,7 +162,7 @@ void Request::resetRedirectCount() { redirectCount_ = 0; } - + void Request::setMaxPipelinedRequest(int num) { maxPipelinedRequest_ = num; diff --git a/src/RequestGroup.cc b/src/RequestGroup.cc index 31b2262a..4f3fca38 100644 --- a/src/RequestGroup.cc +++ b/src/RequestGroup.cc @@ -204,7 +204,7 @@ error_code::Value RequestGroup::downloadResult() const } else { return lastErrorCode_; } - } + } } void RequestGroup::closeFile() @@ -379,7 +379,7 @@ void RequestGroup::createInitialCommand SharedHandle entry (new BtCheckIntegrityEntry(this)); entry->onDownloadIncomplete(commands, e); - + return; } removeDefunctControlFile(progressInfoFile); @@ -684,7 +684,7 @@ void RequestGroup::adjustFilename if(infoFile->exists()) { // Use current filename } else { - File outfile(getFirstFilePath()); + File outfile(getFirstFilePath()); if(outfile.exists() && option_->getAsBool(PREF_CONTINUE) && outfile.size() <= downloadContext_->getTotalLength()) { // File exists but user decided to resume it. @@ -728,7 +728,7 @@ void RequestGroup::loadAndOpenFile progressInfoFile->load(); pieceStorage_->getDiskAdaptor()->openExistingFile(); } else { - File outfile(getFirstFilePath()); + File outfile(getFirstFilePath()); if(outfile.exists() && option_->getAsBool(PREF_CONTINUE) && outfile.size() <= getTotalLength()) { pieceStorage_->getDiskAdaptor()->openExistingFile(); diff --git a/src/RequestGroup.h b/src/RequestGroup.h index 4a6e1ad4..7e822570 100644 --- a/src/RequestGroup.h +++ b/src/RequestGroup.h @@ -225,7 +225,7 @@ public: void createNextCommand(std::vector& commands, DownloadEngine* e, int numCommand); - + void createNextCommand(std::vector& commands, DownloadEngine* e); bool downloadFinished() const; diff --git a/src/RequestSlot.h b/src/RequestSlot.h index 9ebf2cf2..9ad5e9fe 100644 --- a/src/RequestSlot.h +++ b/src/RequestSlot.h @@ -68,7 +68,7 @@ private: piece_ = requestSlot.piece_; } public: - + RequestSlot(size_t index, int32_t begin, int32_t length, size_t blockIndex, const SharedHandle& piece = SharedHandle()): dispatchedTime_(global::wallclock()), @@ -107,7 +107,7 @@ public: { return !(*this == requestSlot); } - + bool operator<(const RequestSlot& requestSlot) const { if(index_ == requestSlot.index_) { diff --git a/src/RpcMethod.cc b/src/RpcMethod.cc index a06fd714..7f936eab 100644 --- a/src/RpcMethod.cc +++ b/src/RpcMethod.cc @@ -115,7 +115,7 @@ void gatherOption } } } - } + } } } // namespace diff --git a/src/RpcMethodImpl.cc b/src/RpcMethodImpl.cc index be0b8916..adffb584 100644 --- a/src/RpcMethodImpl.cc +++ b/src/RpcMethodImpl.cc @@ -359,7 +359,7 @@ SharedHandle AddMetalinkRpcMethod::process } } return gids; -} +} #endif // ENABLE_METALINK namespace { @@ -513,7 +513,7 @@ SharedHandle UnpauseRpcMethod::process throw DL_ABORT_EX(fmt("GID#%" PRId64 " cannot be unpaused now", gid)); } else { group->setPauseRequested(false); - e->getRequestGroupMan()->requestQueueCheck(); + e->getRequestGroupMan()->requestQueueCheck(); } return createGIDResponse(gid); } @@ -526,7 +526,7 @@ SharedHandle UnpauseAllRpcMethod::process std::for_each(groups.begin(), groups.end(), std::bind2nd(mem_fun_sh(&RequestGroup::setPauseRequested), false)); - e->getRequestGroupMan()->requestQueueCheck(); + e->getRequestGroupMan()->requestQueueCheck(); return VLB_OK; } diff --git a/src/RpcResponse.h b/src/RpcResponse.h index 7a305f54..31f43928 100644 --- a/src/RpcResponse.h +++ b/src/RpcResponse.h @@ -49,7 +49,7 @@ namespace rpc { struct RpcResponse { // 0 for success, non-zero for error int code; - + SharedHandle param; SharedHandle id; diff --git a/src/Segment.h b/src/Segment.h index 946f3006..4f37888c 100644 --- a/src/Segment.h +++ b/src/Segment.h @@ -55,7 +55,7 @@ public: virtual size_t getIndex() const = 0; virtual int64_t getPosition() const = 0; - + virtual int64_t getPositionToWrite() const = 0; virtual int32_t getLength() const = 0; diff --git a/src/SegmentMan.h b/src/SegmentMan.h index 16a322ca..54cffdb9 100644 --- a/src/SegmentMan.h +++ b/src/SegmentMan.h @@ -150,7 +150,7 @@ public: size_t maxSegments); /** - * Returns a segment whose index is index. + * Returns a segment whose index is index. * If it has already assigned * to another cuid or has been downloaded, then returns a segment instance * whose isNull call is true. @@ -228,7 +228,7 @@ public: } /** - * Returns current download speed in bytes per sec. + * Returns current download speed in bytes per sec. */ int calculateDownloadSpeed(); diff --git a/src/SelectEventPoll.cc b/src/SelectEventPoll.cc index c0c280ab..ba0e00ca 100644 --- a/src/SelectEventPoll.cc +++ b/src/SelectEventPoll.cc @@ -171,7 +171,7 @@ void SelectEventPoll::poll(const struct timeval& tv) { fd_set rfds; fd_set wfds; - + memcpy(&rfds, &rfdset_, sizeof(fd_set)); memcpy(&wfds, &wfdset_, sizeof(fd_set)); #ifdef __MINGW32__ diff --git a/src/SelectEventPoll.h b/src/SelectEventPoll.h index fcceab1a..f4eeabe6 100644 --- a/src/SelectEventPoll.h +++ b/src/SelectEventPoll.h @@ -55,12 +55,12 @@ private: int events_; public: CommandEvent(Command* command, int events); - + Command* getCommand() const { return command_; } - + void addEvents(int events) { events_ |= events; @@ -68,14 +68,14 @@ private: void removeEvents(int events) { - events_ &= (~events); + events_ &= (~events); } - + bool eventsEmpty() const { return events_ == 0; } - + bool operator==(const CommandEvent& commandEvent) const { return command_ == commandEvent.command_; @@ -85,7 +85,7 @@ private: { return events_; } - + void processEvents(int events); }; @@ -97,7 +97,7 @@ private: sock_t socket_; std::deque commandEvents_; - public: + public: SocketEntry(sock_t socket); bool operator==(const SocketEntry& entry) const @@ -109,9 +109,9 @@ private: { return socket_ < entry.socket_; } - + void addCommandEvent(Command* command, int events); - + void removeCommandEvent(Command* command, int events); int getEvents(); @@ -120,12 +120,12 @@ private: { return socket_; } - + bool eventEmpty() const { return commandEvents_.empty(); } - + void processEvents(int events); }; @@ -134,9 +134,9 @@ private: class AsyncNameResolverEntry { private: SharedHandle nameResolver_; - + Command* command_; - + public: AsyncNameResolverEntry(const SharedHandle& nameResolver, Command* command); diff --git a/src/SequentialDispatcherCommand.h b/src/SequentialDispatcherCommand.h index 92f30f15..005d226f 100644 --- a/src/SequentialDispatcherCommand.h +++ b/src/SequentialDispatcherCommand.h @@ -64,7 +64,7 @@ public: { setStatusRealtime(); } - + virtual bool execute() { if(e_->getRequestGroupMan()->downloadFinished() || e_->isHaltRequested()) { diff --git a/src/ServerStat.cc b/src/ServerStat.cc index 7bf9fdd1..253b599c 100644 --- a/src/ServerStat.cc +++ b/src/ServerStat.cc @@ -96,7 +96,7 @@ void ServerStat::updateSingleConnectionAvgSpeed(int downloadSpeed) return; if(counter_ < 5) { avgDownloadSpeed = - ((((float)counter_-1)/(float)counter_)*(float)singleConnectionAvgSpeed_)+ + ((((float)counter_-1)/(float)counter_)*(float)singleConnectionAvgSpeed_)+ ((1.0/(float)counter_)*(float)downloadSpeed); } else { @@ -130,7 +130,7 @@ void ServerStat::updateMultiConnectionAvgSpeed(int downloadSpeed) return; if(counter_ < 5) { avgDownloadSpeed = - ((((float)counter_-1)/(float)counter_)*(float)multiConnectionAvgSpeed_) + + ((((float)counter_-1)/(float)counter_)*(float)multiConnectionAvgSpeed_) + ((1.0/(float)counter_)*(float)downloadSpeed); } else { diff --git a/src/ServerStat.h b/src/ServerStat.h index 03eedd52..6bd33678 100644 --- a/src/ServerStat.h +++ b/src/ServerStat.h @@ -149,13 +149,13 @@ public: std::string toString() const; private: std::string hostname_; - + std::string protocol_; int downloadSpeed_; - + int singleConnectionAvgSpeed_; - + int multiConnectionAvgSpeed_; int counter_; diff --git a/src/ServerStatMan.cc b/src/ServerStatMan.cc index f550f9cd..81ae7db5 100644 --- a/src/ServerStatMan.cc +++ b/src/ServerStatMan.cc @@ -76,7 +76,7 @@ bool ServerStatMan::add(const SharedHandle& serverStat) } else { serverStats_.insert(i, serverStat); return true; - } + } } bool ServerStatMan::save(const std::string& filename) const diff --git a/src/SharedHandle.h b/src/SharedHandle.h index 5c94c205..fa18c434 100644 --- a/src/SharedHandle.h +++ b/src/SharedHandle.h @@ -41,7 +41,7 @@ // To Use std::tr1::shared_ptr uncomment following few lines and // comment out SharedHandle stuff. -// +// // #include // #define SharedHandle std::tr1::shared_ptr // #define WeakHandle std::tr1::weak_ptr @@ -315,7 +315,7 @@ public: ~WeakHandle() {} - WeakHandle& operator=(const WeakHandle& t) { + WeakHandle& operator=(const WeakHandle& t) { ucount_.reassign(t.ucount_); obj_ = t.obj_; return *this; @@ -329,7 +329,7 @@ public: } template - WeakHandle& operator=(const WeakHandle& t) { + WeakHandle& operator=(const WeakHandle& t) { ucount_.reassign(t.ucount_); obj_ = t.obj_; return *this; diff --git a/src/SimpleRandomizer.cc b/src/SimpleRandomizer.cc index cdeedde7..9f23ea77 100644 --- a/src/SimpleRandomizer.cc +++ b/src/SimpleRandomizer.cc @@ -51,7 +51,7 @@ const SharedHandle& SimpleRandomizer::getInstance() } return randomizer_; } - + void SimpleRandomizer::init() { #ifndef __MINGW32__ diff --git a/src/SingleFileAllocationIterator.h b/src/SingleFileAllocationIterator.h index 21503a02..73eaf1d1 100644 --- a/src/SingleFileAllocationIterator.h +++ b/src/SingleFileAllocationIterator.h @@ -60,7 +60,7 @@ public: virtual ~SingleFileAllocationIterator(); virtual void allocateChunk(); - + virtual bool finished(); virtual int64_t getCurrentLength() diff --git a/src/SocketBuffer.h b/src/SocketBuffer.h index 687cd703..c433d8d0 100644 --- a/src/SocketBuffer.h +++ b/src/SocketBuffer.h @@ -79,7 +79,7 @@ private: private: std::string str_; }; - + SharedHandle socket_; std::deque > bufq_; diff --git a/src/SocketCore.cc b/src/SocketCore.cc index 658071ff..8c8bba60 100644 --- a/src/SocketCore.cc +++ b/src/SocketCore.cc @@ -257,7 +257,7 @@ static sock_t bindTo { struct addrinfo* res; int s = callGetaddrinfo(&res, host, util::uitos(port).c_str(), - family, sockType, getaddrinfoFlags, 0); + family, sockType, getaddrinfoFlags, 0); if(s) { error = gai_strerror(s); return -1; @@ -482,7 +482,7 @@ void SocketCore::setSockOpt int errNum = SOCKET_ERRNO; throw DL_ABORT_EX(fmt(EX_SOCKET_SET_OPT, errorMsg(errNum).c_str())); } -} +} void SocketCore::setMulticastInterface(const std::string& localAddr) { @@ -783,7 +783,7 @@ void SocketCore::readData(char* data, size_t& len) wantRead_ = false; wantWrite_ = false; - if(!secure_) { + if(!secure_) { while((ret = recv(sockfd_, data, len, 0)) == -1 && SOCKET_ERRNO == A2_EINTR); int errNum = SOCKET_ERRNO; @@ -1318,7 +1318,7 @@ void getInterfaceAddress // address is not for this machine. try { SocketCore socket; - socket.bind(rp->ai_addr, rp->ai_addrlen); + socket.bind(rp->ai_addr, rp->ai_addrlen); sockaddr_union bindAddr; memset(&bindAddr, 0, sizeof(bindAddr)); memcpy(&bindAddr.storage, rp->ai_addr, rp->ai_addrlen); @@ -1358,7 +1358,7 @@ int callGetaddrinfo hints.ai_flags = getDefaultAIFlags(); hints.ai_flags |= flags; hints.ai_protocol = protocol; - return getaddrinfo(host, service, &hints, resPtr); + return getaddrinfo(host, service, &hints, resPtr); } int inetNtop(int af, const void* src, char* dst, socklen_t size) diff --git a/src/TimeA2.cc b/src/TimeA2.cc index 6d9889b5..0410cb5d 100644 --- a/src/TimeA2.cc +++ b/src/TimeA2.cc @@ -195,7 +195,7 @@ Time Time::parse(const std::string& datetime, const std::string& format) thetime = INT32_MAX; } } - return Time(thetime); + return Time(thetime); } Time Time::parseRFC1123(const std::string& datetime) diff --git a/src/UTMetadataExtensionMessage.h b/src/UTMetadataExtensionMessage.h index 9b3d6a47..221702e3 100644 --- a/src/UTMetadataExtensionMessage.h +++ b/src/UTMetadataExtensionMessage.h @@ -51,7 +51,7 @@ public: { return extensionMessageID_; } - + virtual const char* getExtensionName() const { return EXTENSION_NAME; diff --git a/src/UTMetadataRequestFactory.cc b/src/UTMetadataRequestFactory.cc index d7b2c8ad..cfe26998 100644 --- a/src/UTMetadataRequestFactory.cc +++ b/src/UTMetadataRequestFactory.cc @@ -78,7 +78,7 @@ void UTMetadataRequestFactory::create m->setBtMessageDispatcher(dispatcher_); m->setBtMessageFactory(messageFactory_); m->setPeer(peer_); - + SharedHandle msg = messageFactory_->createBtExtendedMessage(m); msgs.push_back(msg); tracker_->add(p->getIndex()); diff --git a/src/UnionSeedCriteria.h b/src/UnionSeedCriteria.h index 22af8f40..44e2ee3b 100644 --- a/src/UnionSeedCriteria.h +++ b/src/UnionSeedCriteria.h @@ -47,7 +47,7 @@ private: public: UnionSeedCriteria(); virtual ~UnionSeedCriteria(); - + virtual void reset(); virtual bool evaluate(); @@ -61,5 +61,5 @@ public: }; } // namespace aria2 - + #endif // D_UNION_SEED_CRITERIA_H diff --git a/src/UnknownLengthPieceStorage.h b/src/UnknownLengthPieceStorage.h index d28bd622..f7a64e54 100644 --- a/src/UnknownLengthPieceStorage.h +++ b/src/UnknownLengthPieceStorage.h @@ -49,7 +49,7 @@ private: SharedHandle downloadContext_; const Option* option_; - + SharedHandle diskAdaptor_; SharedHandle diskWriterFactory_; @@ -172,11 +172,11 @@ public: { return getCompletedLength(); } - + virtual void setupFileFilter() {} virtual void clearFileFilter() {} - + /** * Returns true if download has completed. * If file filter is enabled, then returns true if those files have @@ -209,7 +209,7 @@ public: virtual void setBitfield(const unsigned char* bitfield, size_t bitfieldLength) {} - + virtual size_t getBitfieldLength() { return 0; @@ -230,7 +230,7 @@ public: virtual void setEndGamePieceNum(size_t num) {} virtual SharedHandle getDiskAdaptor(); - + virtual int32_t getPieceLength(size_t index); /** diff --git a/src/WebSocketInteractionCommand.h b/src/WebSocketInteractionCommand.h index 20f9896c..c27bf90e 100644 --- a/src/WebSocketInteractionCommand.h +++ b/src/WebSocketInteractionCommand.h @@ -60,7 +60,7 @@ public: const SharedHandle& socket); virtual ~WebSocketInteractionCommand(); - + virtual bool execute(); void updateWriteCheck(); @@ -68,6 +68,6 @@ public: } // namespace rpc -} // namespace aria2 +} // namespace aria2 #endif // D_WEB_SOCKET_INTERACTION_COMMAND_H diff --git a/src/WebSocketResponseCommand.h b/src/WebSocketResponseCommand.h index 8a029686..1c3cc642 100644 --- a/src/WebSocketResponseCommand.h +++ b/src/WebSocketResponseCommand.h @@ -56,6 +56,6 @@ public: } // namespace rpc -} // namespace aria2 +} // namespace aria2 #endif // D_WEB_SOCKET_RESPONSE_COMMAND_H diff --git a/src/WebSocketSession.cc b/src/WebSocketSession.cc index 182e0642..638876cf 100644 --- a/src/WebSocketSession.cc +++ b/src/WebSocketSession.cc @@ -220,7 +220,7 @@ WebSocketSession::WebSocketSession(const SharedHandle& socket, assert(r == 0); wslay_event_config_set_no_buffering(wsctx_, 1); } - + WebSocketSession::~WebSocketSession() { wslay_event_context_free(wsctx_); diff --git a/src/XmlRpcDiskWriter.cc b/src/XmlRpcDiskWriter.cc index 59f622fd..45b090c7 100644 --- a/src/XmlRpcDiskWriter.cc +++ b/src/XmlRpcDiskWriter.cc @@ -52,7 +52,7 @@ void XmlRpcDiskWriter::initAndOpenFile(int64_t totalLength) { parser_.reset(); } - + void XmlRpcDiskWriter::writeData(const unsigned char* data, size_t len, int64_t offset) { diff --git a/src/XmlRpcDiskWriter.h b/src/XmlRpcDiskWriter.h index 98d40c8b..93d3f83c 100644 --- a/src/XmlRpcDiskWriter.h +++ b/src/XmlRpcDiskWriter.h @@ -55,7 +55,7 @@ public: virtual ~XmlRpcDiskWriter(); virtual void initAndOpenFile(int64_t totalLength = 0); - + virtual void openFile(int64_t totalLength = 0) { initAndOpenFile(totalLength); diff --git a/src/XmlRpcRequestParserController.cc b/src/XmlRpcRequestParserController.cc index 957766aa..cf01aace 100644 --- a/src/XmlRpcRequestParserController.cc +++ b/src/XmlRpcRequestParserController.cc @@ -102,5 +102,5 @@ void XmlRpcRequestParserController::reset() } } // namespace rpc - + } // namespace aria2 diff --git a/src/XmlRpcRequestParserController.h b/src/XmlRpcRequestParserController.h index 099e4c77..f6499e87 100644 --- a/src/XmlRpcRequestParserController.h +++ b/src/XmlRpcRequestParserController.h @@ -80,7 +80,7 @@ public: // Pops StateFrame p from frameStack_ and add currentFrame_.value_ // to p and currentFrame_ = p; void popArrayFrame(); - + void setCurrentFrameValue(const SharedHandle& value); void setCurrentFrameName(const std::string& name); diff --git a/src/XmlRpcRequestParserState.h b/src/XmlRpcRequestParserState.h index 79b421ee..4dfb9dae 100644 --- a/src/XmlRpcRequestParserState.h +++ b/src/XmlRpcRequestParserState.h @@ -55,7 +55,7 @@ public: virtual void beginElement(XmlRpcRequestParserStateMachine* psm, const char* name, const std::vector& attrs)= 0; - + virtual void endElement(XmlRpcRequestParserStateMachine* psm, const char* name, const std::string& characters) = 0; diff --git a/src/XmlRpcRequestParserStateImpl.cc b/src/XmlRpcRequestParserStateImpl.cc index 4f71ae13..d263f663 100644 --- a/src/XmlRpcRequestParserStateImpl.cc +++ b/src/XmlRpcRequestParserStateImpl.cc @@ -57,9 +57,9 @@ void InitialXmlRpcRequestParserState::beginElement psm->pushMethodCallState(); } else { psm->pushUnknownElementState(); - } + } } - + void InitialXmlRpcRequestParserState::endElement (XmlRpcRequestParserStateMachine* psm, const char* name, @@ -90,9 +90,9 @@ void MethodCallXmlRpcRequestParserState::beginElement psm->pushParamsState(); } else { psm->pushUnknownElementState(); - } + } } - + // MethodNameXmlRpcRequestParserState void MethodNameXmlRpcRequestParserState::beginElement @@ -102,7 +102,7 @@ void MethodNameXmlRpcRequestParserState::beginElement { psm->pushUnknownElementState(); } - + void MethodNameXmlRpcRequestParserState::endElement (XmlRpcRequestParserStateMachine* psm, const char* name, @@ -125,7 +125,7 @@ void ParamsXmlRpcRequestParserState::beginElement psm->pushUnknownElementState(); } } - + // ParamXmlRpcRequestParserState void ParamXmlRpcRequestParserState::beginElement @@ -147,7 +147,7 @@ void ParamXmlRpcRequestParserState::endElement { psm->popArrayFrame(); } - + // ValueXmlRpcRequestParserState void ValueXmlRpcRequestParserState::beginElement @@ -194,7 +194,7 @@ void IntXmlRpcRequestParserState::beginElement { psm->pushUnknownElementState(); } - + void IntXmlRpcRequestParserState::endElement (XmlRpcRequestParserStateMachine* psm, const char* name, @@ -217,7 +217,7 @@ void StringXmlRpcRequestParserState::beginElement { psm->pushUnknownElementState(); } - + void StringXmlRpcRequestParserState::endElement (XmlRpcRequestParserStateMachine* psm, const char* name, @@ -235,7 +235,7 @@ void Base64XmlRpcRequestParserState::beginElement { psm->pushUnknownElementState(); } - + void Base64XmlRpcRequestParserState::endElement (XmlRpcRequestParserStateMachine* psm, const char* name, diff --git a/src/XmlRpcRequestParserStateImpl.h b/src/XmlRpcRequestParserStateImpl.h index 6636865a..e2bfd5c5 100644 --- a/src/XmlRpcRequestParserStateImpl.h +++ b/src/XmlRpcRequestParserStateImpl.h @@ -46,7 +46,7 @@ public: virtual void beginElement(XmlRpcRequestParserStateMachine* psm, const char* name, const std::vector& attrs); - + virtual void endElement(XmlRpcRequestParserStateMachine* psm, const char* name, const std::string& characters); @@ -59,7 +59,7 @@ public: virtual void beginElement(XmlRpcRequestParserStateMachine* psm, const char* name, const std::vector& attrs); - + virtual void endElement(XmlRpcRequestParserStateMachine* psm, const char* name, const std::string& characters) {} @@ -72,7 +72,7 @@ public: virtual void beginElement(XmlRpcRequestParserStateMachine* psm, const char* name, const std::vector& attrs); - + virtual void endElement(XmlRpcRequestParserStateMachine* psm, const char* name, const std::string& characters) {} @@ -85,7 +85,7 @@ public: virtual void beginElement(XmlRpcRequestParserStateMachine* psm, const char* name, const std::vector& attrs); - + virtual void endElement(XmlRpcRequestParserStateMachine* psm, const char* name, const std::string& characters); @@ -97,7 +97,7 @@ class ParamsXmlRpcRequestParserState:public XmlRpcRequestParserState { virtual void beginElement(XmlRpcRequestParserStateMachine* psm, const char* name, const std::vector& attrs); - + virtual void endElement(XmlRpcRequestParserStateMachine* psm, const char* name, const std::string& characters) {} @@ -109,7 +109,7 @@ class ParamXmlRpcRequestParserState:public XmlRpcRequestParserState { virtual void beginElement(XmlRpcRequestParserStateMachine* psm, const char* name, const std::vector& attrs); - + virtual void endElement(XmlRpcRequestParserStateMachine* psm, const char* name, const std::string& characters); @@ -133,7 +133,7 @@ class IntXmlRpcRequestParserState:public XmlRpcRequestParserState { virtual void beginElement(XmlRpcRequestParserStateMachine* psm, const char* name, const std::vector& attrs); - + virtual void endElement(XmlRpcRequestParserStateMachine* psm, const char* name, const std::string& characters); @@ -145,7 +145,7 @@ class StringXmlRpcRequestParserState:public XmlRpcRequestParserState { virtual void beginElement(XmlRpcRequestParserStateMachine* psm, const char* name, const std::vector& attrs); - + virtual void endElement(XmlRpcRequestParserStateMachine* psm, const char* name, const std::string& characters); @@ -157,7 +157,7 @@ class Base64XmlRpcRequestParserState:public XmlRpcRequestParserState { virtual void beginElement(XmlRpcRequestParserStateMachine* psm, const char* name, const std::vector& attrs); - + virtual void endElement(XmlRpcRequestParserStateMachine* psm, const char* name, const std::string& characters); @@ -169,7 +169,7 @@ class StructXmlRpcRequestParserState:public XmlRpcRequestParserState { virtual void beginElement(XmlRpcRequestParserStateMachine* psm, const char* name, const std::vector& attrs); - + virtual void endElement(XmlRpcRequestParserStateMachine* psm, const char* name, const std::string& characters) {} @@ -181,7 +181,7 @@ class MemberXmlRpcRequestParserState:public XmlRpcRequestParserState { virtual void beginElement(XmlRpcRequestParserStateMachine* psm, const char* name, const std::vector& attrs); - + virtual void endElement(XmlRpcRequestParserStateMachine* psm, const char* name, const std::string& characters); @@ -193,7 +193,7 @@ class NameXmlRpcRequestParserState:public XmlRpcRequestParserState { virtual void beginElement(XmlRpcRequestParserStateMachine* psm, const char* name, const std::vector& attrs); - + virtual void endElement(XmlRpcRequestParserStateMachine* psm, const char* name, const std::string& characters); @@ -205,7 +205,7 @@ class ArrayXmlRpcRequestParserState:public XmlRpcRequestParserState { virtual void beginElement(XmlRpcRequestParserStateMachine* psm, const char* name, const std::vector& attrs); - + virtual void endElement(XmlRpcRequestParserStateMachine* psm, const char* name, const std::string& characters) {} @@ -217,7 +217,7 @@ class DataXmlRpcRequestParserState:public XmlRpcRequestParserState { virtual void beginElement(XmlRpcRequestParserStateMachine* psm, const char* name, const std::vector& attrs); - + virtual void endElement(XmlRpcRequestParserStateMachine* psm, const char* name, const std::string& characters) {} diff --git a/src/asctime_r.h b/src/asctime_r.h index 21e31da5..0c38ff3a 100644 --- a/src/asctime_r.h +++ b/src/asctime_r.h @@ -39,9 +39,9 @@ #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ - + #include - + char * asctime_r (const struct tm*, char*); #ifdef __cplusplus diff --git a/src/base32.cc b/src/base32.cc index fbfcc189..41fcaa39 100644 --- a/src/base32.cc +++ b/src/base32.cc @@ -65,7 +65,7 @@ std::string encode(const std::string& src) } ret.append(&temp[0], &temp[8]); count = 0; - buf = 0; + buf = 0; } } size_t r = 0; diff --git a/src/bitfield.h b/src/bitfield.h index 9d98114e..db4cddb0 100644 --- a/src/bitfield.h +++ b/src/bitfield.h @@ -75,22 +75,22 @@ inline bool test(const Array& bitfield, size_t nbits, size_t index) inline size_t countBit32(uint32_t n) { static const int nbits[] = { - 0, 1, 1, 2, 1, 2, 2, 3, 1, 2, 2, 3, 2, 3, 3, 4, - 1, 2, 2, 3, 2, 3, 3, 4, 2, 3, 3, 4, 3, 4, 4, 5, - 1, 2, 2, 3, 2, 3, 3, 4, 2, 3, 3, 4, 3, 4, 4, 5, - 2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6, - 1, 2, 2, 3, 2, 3, 3, 4, 2, 3, 3, 4, 3, 4, 4, 5, - 2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6, - 2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6, - 3, 4, 4, 5, 4, 5, 5, 6, 4, 5, 5, 6, 5, 6, 6, 7, - 1, 2, 2, 3, 2, 3, 3, 4, 2, 3, 3, 4, 3, 4, 4, 5, - 2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6, - 2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6, - 3, 4, 4, 5, 4, 5, 5, 6, 4, 5, 5, 6, 5, 6, 6, 7, - 2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6, - 3, 4, 4, 5, 4, 5, 5, 6, 4, 5, 5, 6, 5, 6, 6, 7, - 3, 4, 4, 5, 4, 5, 5, 6, 4, 5, 5, 6, 5, 6, 6, 7, - 4, 5, 5, 6, 5, 6, 6, 7, 5, 6, 6, 7, 6, 7, 7, 8, + 0, 1, 1, 2, 1, 2, 2, 3, 1, 2, 2, 3, 2, 3, 3, 4, + 1, 2, 2, 3, 2, 3, 3, 4, 2, 3, 3, 4, 3, 4, 4, 5, + 1, 2, 2, 3, 2, 3, 3, 4, 2, 3, 3, 4, 3, 4, 4, 5, + 2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6, + 1, 2, 2, 3, 2, 3, 3, 4, 2, 3, 3, 4, 3, 4, 4, 5, + 2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6, + 2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6, + 3, 4, 4, 5, 4, 5, 5, 6, 4, 5, 5, 6, 5, 6, 6, 7, + 1, 2, 2, 3, 2, 3, 3, 4, 2, 3, 3, 4, 3, 4, 4, 5, + 2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6, + 2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6, + 3, 4, 4, 5, 4, 5, 5, 6, 4, 5, 5, 6, 5, 6, 6, 7, + 2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6, + 3, 4, 4, 5, 4, 5, 5, 6, 4, 5, 5, 6, 5, 6, 6, 7, + 3, 4, 4, 5, 4, 5, 5, 6, 4, 5, 5, 6, 5, 6, 6, 7, + 4, 5, 5, 6, 5, 6, 6, 7, 5, 6, 6, 7, 6, 7, 7, 8, }; return nbits[n&0xffu]+ diff --git a/src/bittorrent_helper.cc b/src/bittorrent_helper.cc index e40cd6bf..f24f4ae7 100644 --- a/src/bittorrent_helper.cc +++ b/src/bittorrent_helper.cc @@ -265,7 +265,7 @@ void extractFileEntries throw DL_ABORT_EX2("Path is empty.", error_code::BITTORRENT_PARSE_ERROR); } - + std::vector pathelem(pathList->size()+1); pathelem[0] = utf8Name; std::vector::iterator pathelemOutItr = pathelem.begin(); @@ -757,7 +757,7 @@ void checkBegin(int32_t begin, int32_t pieceLength) { if(!(begin < pieceLength)) { throw DL_ABORT_EX(fmt("Invalid begin: %d", begin)); - } + } } void checkLength(int32_t length) diff --git a/src/bittorrent_helper.h b/src/bittorrent_helper.h index 47ed1701..a8cef945 100644 --- a/src/bittorrent_helper.h +++ b/src/bittorrent_helper.h @@ -180,7 +180,7 @@ void setShortIntParam(unsigned char* dest, uint16_t param); // Returns message ID located at first byte:msg[0] uint8_t getId(const unsigned char* msg); - + void checkIndex(size_t index, size_t pieces); void checkBegin(int32_t begin, int32_t pieceLength); void checkLength(int32_t length); diff --git a/src/cookie_helper.cc b/src/cookie_helper.cc index 41a61237..a61055aa 100644 --- a/src/cookie_helper.cc +++ b/src/cookie_helper.cc @@ -202,7 +202,7 @@ bool parseDate return false; } } - + tm timespec; memset(×pec, 0, sizeof(timespec)); timespec.tm_sec = second; @@ -355,7 +355,7 @@ bool parse if(cookiePath.empty()) { cookiePath = defaultPath; } - + cookie.setName(cookieName.first, cookieName.second); cookie.setValue(cookieValue.first, cookieValue.second); cookie.setExpiryTime(expiryTime); diff --git a/src/prefs.cc b/src/prefs.cc index 160cd3c3..70a9a0c2 100644 --- a/src/prefs.cc +++ b/src/prefs.cc @@ -383,7 +383,7 @@ const Pref* PREF_HTTP_NO_CACHE = makePref("http-no-cache"); // value: true | false const Pref* PREF_HTTP_ACCEPT_GZIP = makePref("http-accept-gzip"); -/** +/** * Proxy related preferences */ const Pref* PREF_HTTP_PROXY = makePref("http-proxy"); diff --git a/src/uri.cc b/src/uri.cc index 54dacf03..ead89a4f 100644 --- a/src/uri.cc +++ b/src/uri.cc @@ -215,7 +215,7 @@ bool parse(UriStruct& result, const std::string& uri) if(65535 < tempPort) { return false; } - result.port = tempPort; + result.port = tempPort; } else { return false; } diff --git a/src/usage_text.h b/src/usage_text.h index 513259df..a3c50e02 100644 --- a/src/usage_text.h +++ b/src/usage_text.h @@ -157,7 +157,7 @@ _(" --allow-piece-length-change[=true|false] If false is given, aria2 aborts\n" \ " download when a piece length is different from\n" \ " one in a control file. If true is given, you can\n" \ - " proceed but some download progress will be lost.") + " proceed but some download progress will be lost.") #define TEXT_FORCE_SEQUENTIAL \ _(" -Z, --force-sequential[=true|false] Fetch URIs in the command-line sequentially\n" \ " and download each URI in a separate session, like\n" \ diff --git a/src/util.cc b/src/util.cc index 189d91aa..07981b74 100644 --- a/src/util.cc +++ b/src/util.cc @@ -365,7 +365,7 @@ bool isUtf8(const std::string& str) if(++s == eos || !in(static_cast(*s), 0x80u, 0x9fu) || ++s == eos || !isUtf8Tail(*s)) { return false; - } + } } else if(0xf0u == firstChar) { // UTF8-4 if(++s == eos || !in(static_cast(*s), 0x90u, 0xbfu) || @@ -1052,9 +1052,9 @@ void usleep(long microseconds) { else state = SKIP_MICROSECONDS; } - + long msec = microseconds / 1000; - microseconds %= 1000; + microseconds %= 1000; if (state == GET_MICROSECONDS && microseconds) { QueryPerformanceCounter(&end); @@ -1476,7 +1476,7 @@ void executeHook if(!rc) { A2_LOG_ERROR("CreateProcess() failed. Cannot execute user command."); } -#endif +#endif } } // namespace diff --git a/test/AbstractCommandTest.cc b/test/AbstractCommandTest.cc index 4932fad3..9d24aad2 100644 --- a/test/AbstractCommandTest.cc +++ b/test/AbstractCommandTest.cc @@ -30,7 +30,7 @@ void AbstractCommandTest::testGetProxyUri() { Option op; CPPUNIT_ASSERT_EQUAL(std::string(), getProxyUri("http", &op)); - + op.put(PREF_HTTP_PROXY, "http://hu:hp@httpproxy/"); op.put(PREF_FTP_PROXY, "ftp://fu:fp@ftpproxy/"); CPPUNIT_ASSERT_EQUAL(std::string("http://hu:hp@httpproxy/"), diff --git a/test/AnnounceListTest.cc b/test/AnnounceListTest.cc index 4d6af9ee..12f5811c 100644 --- a/test/AnnounceListTest.cc +++ b/test/AnnounceListTest.cc @@ -307,7 +307,7 @@ void AnnounceListTest::testMoveToStoppedAllowedTier() { CPPUNIT_ASSERT_EQUAL(std::string("tracker3"), announceList.getAnnounce()); // test wrapped search announceList.moveToStoppedAllowedTier(); - CPPUNIT_ASSERT_EQUAL(std::string("tracker2"), announceList.getAnnounce()); + CPPUNIT_ASSERT_EQUAL(std::string("tracker2"), announceList.getAnnounce()); } void AnnounceListTest::testMoveToCompletedAllowedTier() { @@ -333,7 +333,7 @@ void AnnounceListTest::testMoveToCompletedAllowedTier() { CPPUNIT_ASSERT_EQUAL(std::string("tracker3"), announceList.getAnnounce()); // test wrapped search announceList.moveToStoppedAllowedTier(); - CPPUNIT_ASSERT_EQUAL(std::string("tracker2"), announceList.getAnnounce()); + CPPUNIT_ASSERT_EQUAL(std::string("tracker2"), announceList.getAnnounce()); } } // namespace aria2 diff --git a/test/AuthConfigFactoryTest.cc b/test/AuthConfigFactoryTest.cc index e660bdfc..5f534bfc 100644 --- a/test/AuthConfigFactoryTest.cc +++ b/test/AuthConfigFactoryTest.cc @@ -18,7 +18,7 @@ class AuthConfigFactoryTest:public CppUnit::TestFixture { CPPUNIT_TEST(testCreateAuthConfig_ftp); CPPUNIT_TEST(testUpdateBasicCred); CPPUNIT_TEST_SUITE_END(); - + public: void testCreateAuthConfig_http(); void testCreateAuthConfig_httpNoChallenge(); @@ -83,7 +83,7 @@ void AuthConfigFactoryTest::testCreateAuthConfig_http() // username and password in URI req->setUri("http://aria2user:aria2password@localhost/download/aria2-1.0.0.tar.bz2"); CPPUNIT_ASSERT_EQUAL(std::string("aria2user:aria2password"), - factory.createAuthConfig(req, &option)->getAuthText()); + factory.createAuthConfig(req, &option)->getAuthText()); } void AuthConfigFactoryTest::testCreateAuthConfig_httpNoChallenge() @@ -129,7 +129,7 @@ void AuthConfigFactoryTest::testCreateAuthConfig_httpNoChallenge() // username and password in URI req->setUri("http://aria2user:aria2password@localhost/download/aria2-1.0.0.tar.bz2"); CPPUNIT_ASSERT_EQUAL(std::string("aria2user:aria2password"), - factory.createAuthConfig(req, &option)->getAuthText()); + factory.createAuthConfig(req, &option)->getAuthText()); } void AuthConfigFactoryTest::testCreateAuthConfig_ftp() diff --git a/test/BitfieldManTest.cc b/test/BitfieldManTest.cc index bc7ebcc2..de1fce4b 100644 --- a/test/BitfieldManTest.cc +++ b/test/BitfieldManTest.cc @@ -49,7 +49,7 @@ public: void testGetAllMissingIndexes_noarg(); void testGetAllMissingIndexes_checkLastByte(); void testGetAllMissingUnusedIndexes(); - + void testIsAllBitSet(); void testFilter(); void testIsFilterBitSet(); @@ -196,7 +196,7 @@ void BitfieldManTest::testIsAllBitSet() { CPPUNIT_ASSERT(!bt1.isAllBitSet()); bt1.setBit(1); CPPUNIT_ASSERT(!bt1.isAllBitSet()); - + for(size_t i = 0; i < 8; i++) { CPPUNIT_ASSERT(bt1.setBit(i)); } @@ -426,7 +426,7 @@ void BitfieldManTest::testGetSparseMissingUnusedIndex_withMinSplitSize() CPPUNIT_ASSERT(bitfield.getSparseMissingUnusedIndex(index, minSplitSize, ignoreBitfield, length)); CPPUNIT_ASSERT_EQUAL((size_t)5, index); - bitfield.setBit(5); + bitfield.setBit(5); CPPUNIT_ASSERT(!bitfield.getSparseMissingUnusedIndex(index, minSplitSize, ignoreBitfield, length)); } @@ -449,11 +449,11 @@ void BitfieldManTest::testIsBitSetOffsetRange() bitfield.setBit(100); bitfield.setBit(101); - + CPPUNIT_ASSERT(bitfield.isBitSetOffsetRange(pieceLength*100, pieceLength*2)); CPPUNIT_ASSERT(!bitfield.isBitSetOffsetRange(pieceLength*100-10, pieceLength*2)); CPPUNIT_ASSERT(!bitfield.isBitSetOffsetRange(pieceLength*100, pieceLength*2+1)); - + bitfield.clearAllBit(); bitfield.setBit(100); @@ -668,7 +668,7 @@ void BitfieldManTest::testGetFirstNMissingUnusedIndex() CPPUNIT_ASSERT_EQUAL((size_t)3, out.size()); for(size_t i = 0; i < out.size(); ++i) { CPPUNIT_ASSERT_EQUAL(ans[i], out[i]); - } + } CPPUNIT_ASSERT_EQUAL((size_t)0, bt.getFirstNMissingUnusedIndex(out, 0)); bt.setAllBit(); CPPUNIT_ASSERT_EQUAL((size_t)0, bt.getFirstNMissingUnusedIndex(out, 10)); diff --git a/test/BittorrentHelperTest.cc b/test/BittorrentHelperTest.cc index bbfa90d1..895e9ad8 100644 --- a/test/BittorrentHelperTest.cc +++ b/test/BittorrentHelperTest.cc @@ -560,7 +560,7 @@ void BittorrentHelperTest::testGetNodes() CPPUNIT_ASSERT_EQUAL((uint16_t)6882, attrs->nodes[0].second); } { - // bad port + // bad port std::string memory = "d5:nodesl" "l11:192.168.0.11:xe" @@ -815,7 +815,7 @@ void BittorrentHelperTest::testTorrent2Magnet() { SharedHandle dctx(new DownloadContext()); load(A2_TEST_DIR"/test.torrent", dctx, option_); - + CPPUNIT_ASSERT_EQUAL (std::string("magnet:?xt=urn:btih:248D0A1CD08284299DE78D5C1ED359BB46717D8C" "&dn=aria2-test" @@ -935,7 +935,7 @@ void BittorrentHelperTest::testRemoveAnnounceUri() tier2.push_back("http://host3/announce"); attrs->announceList.push_back(tier1); attrs->announceList.push_back(tier2); - + std::vector removeUris; removeUris.push_back(tier1[0]); removeUris.push_back(tier2[0]); diff --git a/test/BtChokeMessageTest.cc b/test/BtChokeMessageTest.cc index 94ed070e..83465df5 100644 --- a/test/BtChokeMessageTest.cc +++ b/test/BtChokeMessageTest.cc @@ -126,7 +126,7 @@ void BtChokeMessageTest::testOnSendComplete() { msg.onSendComplete(); CPPUNIT_ASSERT(dispatcher->doChokingActionCalled); - CPPUNIT_ASSERT(peer->amChoking()); + CPPUNIT_ASSERT(peer->amChoking()); } void BtChokeMessageTest::testToString() { diff --git a/test/BtDependencyTest.cc b/test/BtDependencyTest.cc index 885a719e..c1a18db6 100644 --- a/test/BtDependencyTest.cc +++ b/test/BtDependencyTest.cc @@ -94,7 +94,7 @@ void BtDependencyTest::testResolve() createDependee(option_, filename, File(filename).size()); dependee->getPieceStorage()->getDiskAdaptor()->enableReadOnly(); dependee->getPieceStorage()->markAllPiecesDone(); - + BtDependency dep(dependant.get(), dependee); CPPUNIT_ASSERT(dep.resolve()); @@ -126,7 +126,7 @@ void BtDependencyTest::testResolve_originalNameNoMatch() createDependee(option_, filename, File(filename).size()); dependee->getPieceStorage()->getDiskAdaptor()->enableReadOnly(); dependee->getPieceStorage()->markAllPiecesDone(); - + BtDependency dep(dependant.get(), dependee); CPPUNIT_ASSERT(dep.resolve()); @@ -157,7 +157,7 @@ void BtDependencyTest::testResolve_multiFile() createDependee(option_, filename, File(filename).size()); dependee->getPieceStorage()->getDiskAdaptor()->enableReadOnly(); dependee->getPieceStorage()->markAllPiecesDone(); - + BtDependency dep(dependant.get(), dependee); CPPUNIT_ASSERT(dep.resolve()); @@ -209,10 +209,10 @@ void BtDependencyTest::testResolve_loadError() SharedHandle dependee = createDependee(option_, "notExist", 40); dependee->getPieceStorage()->markAllPiecesDone(); - + BtDependency dep(dependant.get(), dependee); CPPUNIT_ASSERT(dep.resolve()); - + CPPUNIT_ASSERT (!dependant->getDownloadContext()->hasAttribute(CTX_ATTR_BT)); CPPUNIT_ASSERT_EQUAL(std::string("/tmp/outfile.path"), @@ -223,10 +223,10 @@ void BtDependencyTest::testResolve_dependeeFailure() { SharedHandle dependant = createDependant(option_); SharedHandle dependee = createDependee(option_, "notExist", 40); - + BtDependency dep(dependant.get(), dependee); CPPUNIT_ASSERT(dep.resolve()); - + CPPUNIT_ASSERT (!dependant->getDownloadContext()->hasAttribute(CTX_ATTR_BT)); CPPUNIT_ASSERT_EQUAL(std::string("/tmp/outfile.path"), diff --git a/test/BtExtendedMessageTest.cc b/test/BtExtendedMessageTest.cc index 877b8701..f12e4343 100644 --- a/test/BtExtendedMessageTest.cc +++ b/test/BtExtendedMessageTest.cc @@ -94,7 +94,7 @@ void BtExtendedMessageTest::testDoReceivedAction() { msg.doReceivedAction(); CPPUNIT_ASSERT(exmsg->doReceivedActionCalled_); } - + void BtExtendedMessageTest::testToString() { std::string payload = "4:name3:foo"; uint8_t extendedMessageID = 1; diff --git a/test/BtHaveAllMessageTest.cc b/test/BtHaveAllMessageTest.cc index 5a965608..c86ef691 100644 --- a/test/BtHaveAllMessageTest.cc +++ b/test/BtHaveAllMessageTest.cc @@ -78,11 +78,11 @@ void BtHaveAllMessageTest::testDoReceivedAction() { msg.setPieceStorage(pieceStorage); msg.doReceivedAction(); - + CPPUNIT_ASSERT(peer->isSeeder()); - + peer->setFastExtensionEnabled(false); - + try { msg.doReceivedAction(); CPPUNIT_FAIL("exception must be thrown."); diff --git a/test/BtHaveMessageTest.cc b/test/BtHaveMessageTest.cc index 593a6605..a0cd5a77 100644 --- a/test/BtHaveMessageTest.cc +++ b/test/BtHaveMessageTest.cc @@ -122,7 +122,7 @@ void BtHaveMessageTest::testDoReceivedAction_goodByeSeeder() // success } } - + void BtHaveMessageTest::testToString() { BtHaveMessage msg; msg.setIndex(1); diff --git a/test/BtPieceMessageTest.cc b/test/BtPieceMessageTest.cc index cd7f446a..9a74cb88 100644 --- a/test/BtPieceMessageTest.cc +++ b/test/BtPieceMessageTest.cc @@ -170,7 +170,7 @@ void BtPieceMessageTest::testChokingEvent_allowedFastEnabled() { msg->onChokingEvent(BtChokingEvent()); - CPPUNIT_ASSERT(msg->isInvalidate()); + CPPUNIT_ASSERT(msg->isInvalidate()); CPPUNIT_ASSERT_EQUAL((size_t)1, btMessageDispatcher->messageQueue.size()); SharedHandle rej = dynamic_pointer_cast @@ -191,7 +191,7 @@ void BtPieceMessageTest::testChokingEvent_inAmAllowedIndexSet() { msg->onChokingEvent(BtChokingEvent()); - CPPUNIT_ASSERT(!msg->isInvalidate()); + CPPUNIT_ASSERT(!msg->isInvalidate()); CPPUNIT_ASSERT_EQUAL((size_t)0, btMessageDispatcher->messageQueue.size()); } @@ -204,7 +204,7 @@ void BtPieceMessageTest::testChokingEvent_invalidate() { msg->onChokingEvent(BtChokingEvent()); - CPPUNIT_ASSERT(msg->isInvalidate()); + CPPUNIT_ASSERT(msg->isInvalidate()); CPPUNIT_ASSERT_EQUAL((size_t)0, btMessageDispatcher->messageQueue.size()); } @@ -217,7 +217,7 @@ void BtPieceMessageTest::testChokingEvent_sendingInProgress() { msg->onChokingEvent(BtChokingEvent()); - CPPUNIT_ASSERT(!msg->isInvalidate()); + CPPUNIT_ASSERT(!msg->isInvalidate()); CPPUNIT_ASSERT_EQUAL((size_t)0, btMessageDispatcher->messageQueue.size()); } @@ -239,7 +239,7 @@ void BtPieceMessageTest::testCancelSendingPieceEvent_noMatch() { msg->onCancelSendingPieceEvent(BtCancelSendingPieceEvent(0, 1024, 16*1024)); CPPUNIT_ASSERT(!msg->isInvalidate()); - + msg->onCancelSendingPieceEvent(BtCancelSendingPieceEvent(1, 0, 16*1024)); CPPUNIT_ASSERT(!msg->isInvalidate()); diff --git a/test/BtRejectMessageTest.cc b/test/BtRejectMessageTest.cc index 678d6b9c..c9f55fec 100644 --- a/test/BtRejectMessageTest.cc +++ b/test/BtRejectMessageTest.cc @@ -133,7 +133,7 @@ void BtRejectMessageTest::testDoReceivedAction() { peer->setFastExtensionEnabled(true); RequestSlot slot(1, 16, 32, 2); dispatcher->setRequestSlot(slot); - + CPPUNIT_ASSERT (!RequestSlot::isNull(dispatcher->getOutstandingRequest(1, 16, 32))); @@ -147,21 +147,21 @@ void BtRejectMessageTest::testDoReceivedActionNoMatch() { peer->setFastExtensionEnabled(true); RequestSlot slot(2, 16, 32, 2); dispatcher->setRequestSlot(slot); - + CPPUNIT_ASSERT (!RequestSlot::isNull(dispatcher->getOutstandingRequest(2, 16, 32))); msg->doReceivedAction(); CPPUNIT_ASSERT - (!RequestSlot::isNull(dispatcher->getOutstandingRequest(2, 16, 32))); + (!RequestSlot::isNull(dispatcher->getOutstandingRequest(2, 16, 32))); } void BtRejectMessageTest::testDoReceivedActionFastExtensionDisabled() { RequestSlot slot(1, 16, 32, 2); dispatcher->setRequestSlot(slot); - + CPPUNIT_ASSERT (!RequestSlot::isNull(dispatcher->getOutstandingRequest(1, 16, 32))); try { diff --git a/test/BtRequestMessageTest.cc b/test/BtRequestMessageTest.cc index 23a9132e..daa12b54 100644 --- a/test/BtRequestMessageTest.cc +++ b/test/BtRequestMessageTest.cc @@ -174,7 +174,7 @@ void BtRequestMessageTest::testCreateMessage() { void BtRequestMessageTest::testDoReceivedAction_hasPieceAndAmNotChoking() { peer_->amChoking(false); msg->doReceivedAction(); - + CPPUNIT_ASSERT_EQUAL((size_t)1, dispatcher_->messageQueue.size()); SharedHandle pieceMsg = dynamic_pointer_cast(dispatcher_->messageQueue.front()); @@ -188,7 +188,7 @@ void BtRequestMessageTest::testDoReceivedAction_hasPieceAndAmChokingAndFastExten peer_->amChoking(true); peer_->setFastExtensionEnabled(true); msg->doReceivedAction(); - + CPPUNIT_ASSERT_EQUAL((size_t)1, dispatcher_->messageQueue.size()); SharedHandle pieceMsg = dynamic_pointer_cast(dispatcher_->messageQueue.front()); @@ -201,7 +201,7 @@ void BtRequestMessageTest::testDoReceivedAction_hasPieceAndAmChokingAndFastExten void BtRequestMessageTest::testDoReceivedAction_hasPieceAndAmChokingAndFastExtensionDisabled() { peer_->amChoking(true); msg->doReceivedAction(); - + CPPUNIT_ASSERT_EQUAL((size_t)0, dispatcher_->messageQueue.size()); } @@ -210,7 +210,7 @@ void BtRequestMessageTest::testDoReceivedAction_doesntHavePieceAndFastExtensionE peer_->amChoking(false); peer_->setFastExtensionEnabled(true); msg->doReceivedAction(); - + CPPUNIT_ASSERT_EQUAL((size_t)1, dispatcher_->messageQueue.size()); SharedHandle pieceMsg = dynamic_pointer_cast(dispatcher_->messageQueue.front()); @@ -224,7 +224,7 @@ void BtRequestMessageTest::testDoReceivedAction_doesntHavePieceAndFastExtensionD msg->setIndex(2); peer_->amChoking(false); msg->doReceivedAction(); - + CPPUNIT_ASSERT_EQUAL((size_t)0, dispatcher_->messageQueue.size()); } diff --git a/test/CookieBoxTest.cc b/test/CookieBoxTest.cc index 6543bb2e..95eea5d6 100644 --- a/test/CookieBoxTest.cc +++ b/test/CookieBoxTest.cc @@ -57,7 +57,7 @@ void CookieBoxTest::testCriteriaFind() { CPPUNIT_ASSERT_EQUAL(1, (int)result1.size()); itr = result1.begin(); CPPUNIT_ASSERT_EQUAL(std::string("USER=user"), (*itr).toString()); - + result1 = box.criteriaFind("rednoah.com", "/downloads", 1181473200, false); CPPUNIT_ASSERT_EQUAL(0, (int)result1.size()); } diff --git a/test/CookieHelperTest.cc b/test/CookieHelperTest.cc index e1b3c5f4..7574b3fe 100644 --- a/test/CookieHelperTest.cc +++ b/test/CookieHelperTest.cc @@ -70,7 +70,7 @@ void CookieHelperTest::testDomainMatch() CPPUNIT_ASSERT(cookie::domainMatch("www.example.org", "example.org")); CPPUNIT_ASSERT(!cookie::domainMatch("192.168.0.1", "0.1")); CPPUNIT_ASSERT(!cookie::domainMatch("example.org", "example.com")); - CPPUNIT_ASSERT(!cookie::domainMatch("example.org", "www.example.org")); + CPPUNIT_ASSERT(!cookie::domainMatch("example.org", "www.example.org")); } void CookieHelperTest::testPathMatch() @@ -151,7 +151,7 @@ void CookieHelperTest::testParse() Cookie c; CPPUNIT_ASSERT(cookie::parse(c, str, "localhost", "/", creationDate)); CPPUNIT_ASSERT_EQUAL((time_t)creationDate+100, c.getExpiryTime()); - CPPUNIT_ASSERT(c.getPersistent()); + CPPUNIT_ASSERT(c.getPersistent()); } { // Cookie data cannot be parsed. diff --git a/test/CookieStorageTest.cc b/test/CookieStorageTest.cc index 48f407ed..1bbcd9af 100644 --- a/test/CookieStorageTest.cc +++ b/test/CookieStorageTest.cc @@ -333,7 +333,7 @@ void CookieStorageTest::testLoad_sqlite3() CPPUNIT_ASSERT(!c.getHostOnly()); CPPUNIT_ASSERT_EQUAL(std::string("/path/to"), c.getPath()); CPPUNIT_ASSERT(!c.getSecure()); - + #else // !HAVE_SQLITE3 CPPUNIT_ASSERT(!st.load(A2_TEST_DIR"/cookies.sqlite", 1000)); #endif // !HAVE_SQLITE3 diff --git a/test/CookieTest.cc b/test/CookieTest.cc index c4abe9d6..bf8f6595 100644 --- a/test/CookieTest.cc +++ b/test/CookieTest.cc @@ -78,7 +78,7 @@ void CookieTest::testMatch() CPPUNIT_ASSERT(expireTest.match("www.aria2.org", "/", 999, false)); CPPUNIT_ASSERT(expireTest.match("www.aria2.org", "/", 1000, false)); CPPUNIT_ASSERT(!expireTest.match("www.aria2.org", "/", 1001, false)); - + Cookie fromNumericHost(createCookie("k", "v", "192.168.1.1", true, "/foo", false)); CPPUNIT_ASSERT(fromNumericHost.match("192.168.1.1", "/foo", 0, false)); diff --git a/test/DHTGetPeersMessageTest.cc b/test/DHTGetPeersMessageTest.cc index ee822efe..0343a4c3 100644 --- a/test/DHTGetPeersMessageTest.cc +++ b/test/DHTGetPeersMessageTest.cc @@ -116,7 +116,7 @@ void DHTGetPeersMessageTest::testDoReceivedAction() peerAnnounceStorage.addPeerAnnounce(infoHash, "192.168.0.101", 6889); msg.setPeerAnnounceStorage(&peerAnnounceStorage); - + msg.doReceivedAction(); CPPUNIT_ASSERT_EQUAL((size_t)1, dispatcher.messageQueue_.size()); diff --git a/test/DHTGetPeersReplyMessageTest.cc b/test/DHTGetPeersReplyMessageTest.cc index 064a2bd5..784159ba 100644 --- a/test/DHTGetPeersReplyMessageTest.cc +++ b/test/DHTGetPeersReplyMessageTest.cc @@ -60,7 +60,7 @@ void DHTGetPeersReplyMessageTest::testGetBencodedMessage() nodes[i].reset(new DHTNode()); nodes[i]->setIPAddress("192.168.0."+util::uitos(i+1)); nodes[i]->setPort(6881+i); - + unsigned char buf[COMPACT_LEN_IPV6]; CPPUNIT_ASSERT_EQUAL (COMPACT_LEN_IPV4, @@ -124,7 +124,7 @@ void DHTGetPeersReplyMessageTest::testGetBencodedMessage6() nodes[i].reset(new DHTNode()); nodes[i]->setIPAddress("2001::000"+util::uitos(i+1)); nodes[i]->setPort(6881+i); - + unsigned char buf[COMPACT_LEN_IPV6]; CPPUNIT_ASSERT_EQUAL (COMPACT_LEN_IPV6, bittorrent::packcompact diff --git a/test/DHTMessageFactoryImplTest.cc b/test/DHTMessageFactoryImplTest.cc index b330bf9c..7abec745 100644 --- a/test/DHTMessageFactoryImplTest.cc +++ b/test/DHTMessageFactoryImplTest.cc @@ -88,7 +88,7 @@ void DHTMessageFactoryImplTest::testCreatePingMessage() SharedHandle aDict = Dict::g(); aDict->put("id", String::g(remoteNodeID, DHT_ID_LENGTH)); dict.put("a", aDict); - + SharedHandle m (dynamic_pointer_cast (factory->createQueryMessage(&dict, "192.168.0.1", 6881))); @@ -114,7 +114,7 @@ void DHTMessageFactoryImplTest::testCreatePingReplyMessage() SharedHandle remoteNode(new DHTNode(remoteNodeID)); remoteNode->setIPAddress("192.168.0.1"); remoteNode->setPort(6881); - + SharedHandle m (dynamic_pointer_cast (factory->createResponseMessage("ping", &dict, @@ -139,7 +139,7 @@ void DHTMessageFactoryImplTest::testCreateFindNodeMessage() memset(targetNodeID, 0x11, DHT_ID_LENGTH); aDict->put("target", String::g(targetNodeID, DHT_ID_LENGTH)); dict.put("a", aDict); - + SharedHandle m (dynamic_pointer_cast (factory->createQueryMessage(&dict, "192.168.0.1", 6881))); @@ -185,7 +185,7 @@ void DHTMessageFactoryImplTest::testCreateFindNodeReplyMessage() SharedHandle remoteNode(new DHTNode(remoteNodeID)); remoteNode->setIPAddress("192.168.0.1"); remoteNode->setPort(6881); - + SharedHandle m (dynamic_pointer_cast (factory->createResponseMessage("find_node", &dict, @@ -237,7 +237,7 @@ void DHTMessageFactoryImplTest::testCreateFindNodeReplyMessage6() SharedHandle remoteNode(new DHTNode(remoteNodeID)); remoteNode->setIPAddress("2001::2001"); remoteNode->setPort(6881); - + SharedHandle m (dynamic_pointer_cast (factory->createResponseMessage("find_node", &dict, @@ -268,7 +268,7 @@ void DHTMessageFactoryImplTest::testCreateGetPeersMessage() memset(infoHash, 0x11, DHT_ID_LENGTH); aDict->put("info_hash", String::g(infoHash, DHT_ID_LENGTH)); dict.put("a", aDict); - + SharedHandle m (dynamic_pointer_cast (factory->createQueryMessage(&dict, "192.168.0.1", 6881))); @@ -330,7 +330,7 @@ void DHTMessageFactoryImplTest::testCreateGetPeersReplyMessage() SharedHandle remoteNode(new DHTNode(remoteNodeID)); remoteNode->setIPAddress("192.168.0.1"); remoteNode->setPort(6881); - + SharedHandle m (dynamic_pointer_cast (factory->createResponseMessage("get_peers", &dict, @@ -402,7 +402,7 @@ void DHTMessageFactoryImplTest::testCreateGetPeersReplyMessage6() SharedHandle remoteNode(new DHTNode(remoteNodeID)); remoteNode->setIPAddress("2001::2001"); remoteNode->setPort(6881); - + SharedHandle m (dynamic_pointer_cast (factory->createResponseMessage("get_peers", &dict, @@ -442,7 +442,7 @@ void DHTMessageFactoryImplTest::testCreateAnnouncePeerMessage() aDict->put("port", Integer::g(port)); aDict->put("token", token); dict.put("a", aDict); - + SharedHandle m (dynamic_pointer_cast (factory->createQueryMessage(&dict, "192.168.0.1", 6882))); @@ -475,7 +475,7 @@ void DHTMessageFactoryImplTest::testCreateAnnouncePeerReplyMessage() SharedHandle remoteNode(new DHTNode(remoteNodeID)); remoteNode->setIPAddress("192.168.0.1"); remoteNode->setPort(6881); - + SharedHandle m (dynamic_pointer_cast (factory->createResponseMessage("announce_peer", &dict, diff --git a/test/DHTMessageTrackerEntryTest.cc b/test/DHTMessageTrackerEntryTest.cc index bb8f7628..9510f0d1 100644 --- a/test/DHTMessageTrackerEntryTest.cc +++ b/test/DHTMessageTrackerEntryTest.cc @@ -39,9 +39,9 @@ void DHTMessageTrackerEntryTest::testMatch() SharedHandle msg1(new MockDHTMessage(localNode, node1)); SharedHandle node2(new DHTNode()); SharedHandle msg2(new MockDHTMessage(localNode, node2)); - + DHTMessageTrackerEntry entry(msg1, 30); - + CPPUNIT_ASSERT(entry.match(msg1->getTransactionID(), msg1->getRemoteNode()->getIPAddress(), msg1->getRemoteNode()->getPort())); diff --git a/test/DHTMessageTrackerTest.cc b/test/DHTMessageTrackerTest.cc index 7a9dbecb..301f9709 100644 --- a/test/DHTMessageTrackerTest.cc +++ b/test/DHTMessageTrackerTest.cc @@ -63,7 +63,7 @@ void DHTMessageTrackerTest::testMessageArrived() { Dict resDict; resDict.put("t", m2->getTransactionID()); - + std::pair, SharedHandle > p = tracker.messageArrived(&resDict, m2->getRemoteNode()->getIPAddress(), m2->getRemoteNode()->getPort()); diff --git a/test/DHTPeerAnnounceEntryTest.cc b/test/DHTPeerAnnounceEntryTest.cc index bb1edda7..aa97d0bc 100644 --- a/test/DHTPeerAnnounceEntryTest.cc +++ b/test/DHTPeerAnnounceEntryTest.cc @@ -76,7 +76,7 @@ void DHTPeerAnnounceEntryTest::testAddPeerAddrEntry() entry.addPeerAddrEntry(PeerAddrEntry("192.168.0.1", 6882)); CPPUNIT_ASSERT_EQUAL((size_t)2, entry.countPeerAddrEntry()); - + entry.addPeerAddrEntry(PeerAddrEntry("192.168.0.1", 6881)); CPPUNIT_ASSERT_EQUAL((size_t)2, entry.countPeerAddrEntry()); @@ -104,7 +104,7 @@ void DHTPeerAnnounceEntryTest::testGetPeers() CPPUNIT_ASSERT_EQUAL((size_t)2, peers.size()); CPPUNIT_ASSERT_EQUAL(std::string("192.168.0.1"), peers[0]->getIPAddress()); CPPUNIT_ASSERT_EQUAL((uint16_t)6881, peers[0]->getPort()); - CPPUNIT_ASSERT_EQUAL(std::string("192.168.0.2"), peers[1]->getIPAddress()); + CPPUNIT_ASSERT_EQUAL(std::string("192.168.0.2"), peers[1]->getIPAddress()); CPPUNIT_ASSERT_EQUAL((uint16_t)6882, peers[1]->getPort()); } } diff --git a/test/DHTPeerAnnounceStorageTest.cc b/test/DHTPeerAnnounceStorageTest.cc index 300f7955..08119a86 100644 --- a/test/DHTPeerAnnounceStorageTest.cc +++ b/test/DHTPeerAnnounceStorageTest.cc @@ -38,7 +38,7 @@ void DHTPeerAnnounceStorageTest::testAddAnnounce() storage.addPeerAnnounce(infohash1, "192.168.0.2", 6882); storage.addPeerAnnounce(infohash2, "192.168.0.3", 6883); storage.addPeerAnnounce(infohash2, "192.168.0.4", 6884); - + std::vector > peers; storage.getPeers(peers, infohash2); diff --git a/test/DHTRoutingTableDeserializerTest.cc b/test/DHTRoutingTableDeserializerTest.cc index 97290c9c..c883e1de 100644 --- a/test/DHTRoutingTableDeserializerTest.cc +++ b/test/DHTRoutingTableDeserializerTest.cc @@ -47,7 +47,7 @@ void DHTRoutingTableDeserializerTest::testDeserialize() } nodesSrc[1]->setIPAddress("non-numerical-name"); std::vector > nodes(vbegin(nodesSrc), vend(nodesSrc)); - + DHTRoutingTableSerializer s(AF_INET); s.setLocalNode(localNode); s.setNodes(nodes); @@ -85,7 +85,7 @@ void DHTRoutingTableDeserializerTest::testDeserialize6() } nodesSrc[1]->setIPAddress("non-numerical-name"); std::vector > nodes(vbegin(nodesSrc), vend(nodesSrc)); - + DHTRoutingTableSerializer s(AF_INET6); s.setLocalNode(localNode); s.setNodes(nodes); diff --git a/test/DHTRoutingTableSerializerTest.cc b/test/DHTRoutingTableSerializerTest.cc index f7fb343f..4a23e9d8 100644 --- a/test/DHTRoutingTableSerializerTest.cc +++ b/test/DHTRoutingTableSerializerTest.cc @@ -108,7 +108,7 @@ void DHTRoutingTableSerializerTest::testSerialize() } nodesSrc[1]->setIPAddress("non-numerical-name"); std::vector > nodes(vbegin(nodesSrc), vend(nodesSrc)); - + DHTRoutingTableSerializer s(AF_INET); s.setLocalNode(localNode); s.setNodes(nodes); @@ -236,7 +236,7 @@ void DHTRoutingTableSerializerTest::testSerialize6() } nodesSrc[1]->setIPAddress("non-numerical-name"); std::vector > nodes(vbegin(nodesSrc), vend(nodesSrc)); - + DHTRoutingTableSerializer s(AF_INET6); s.setLocalNode(localNode); s.setNodes(nodes); diff --git a/test/DHTTokenTrackerTest.cc b/test/DHTTokenTrackerTest.cc index da779ac5..caf67200 100644 --- a/test/DHTTokenTrackerTest.cc +++ b/test/DHTTokenTrackerTest.cc @@ -30,7 +30,7 @@ void DHTTokenTrackerTest::testGenerateToken() util::generateRandomData(infohash, DHT_ID_LENGTH); std::string ipaddr = "192.168.0.1"; uint16_t port = 6881; - + DHTTokenTracker tracker; std::string token = tracker.generateToken(infohash, ipaddr, port); CPPUNIT_ASSERT(tracker.validateToken(token, infohash, ipaddr, port)); diff --git a/test/DefaultBtAnnounceTest.cc b/test/DefaultBtAnnounceTest.cc index 06abf95e..4390c541 100644 --- a/test/DefaultBtAnnounceTest.cc +++ b/test/DefaultBtAnnounceTest.cc @@ -47,13 +47,13 @@ public: int64_t totalLength = 4*1024*1024; int32_t pieceLength = 256*1024; - + static const unsigned char infoHash[] = { 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef, 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef, 0x01, 0x23, 0x45, 0x67 }; - + std::string peerId = "-aria2-ultrafastdltl"; dctx_.reset(new DownloadContext(pieceLength, totalLength)); @@ -292,10 +292,10 @@ void DefaultBtAnnounceTest::testIsAllAnnounceFailed() CPPUNIT_ASSERT(!btAnnounce.isAnnounceReady()); CPPUNIT_ASSERT_EQUAL(std::string(""), btAnnounce.getAnnounceUrl()); CPPUNIT_ASSERT(btAnnounce.isAllAnnounceFailed()); - + btAnnounce.resetAnnounce(); - CPPUNIT_ASSERT(!btAnnounce.isAllAnnounceFailed()); + CPPUNIT_ASSERT(!btAnnounce.isAllAnnounceFailed()); } void DefaultBtAnnounceTest::testURLOrderInStoppedEvent() @@ -396,7 +396,7 @@ void DefaultBtAnnounceTest::testProcessAnnounceResponse() res += "6:peers618:"; res += fromHex("100210354527354678541237324732171ae1"); res += "e"; - + DefaultBtAnnounce an(dctx_, option_); an.setPeerStorage(peerStorage_); an.setBtRuntime(btRuntime_); diff --git a/test/DefaultBtMessageDispatcherTest.cc b/test/DefaultBtMessageDispatcherTest.cc index 96a4e8a8..a5f2a773 100644 --- a/test/DefaultBtMessageDispatcherTest.cc +++ b/test/DefaultBtMessageDispatcherTest.cc @@ -108,7 +108,7 @@ public: bool isDoCancelActionCalled() const { return doCancelActionCalled; - } + } }; class MockPieceStorage2 : public MockPieceStorage { @@ -220,7 +220,7 @@ void DefaultBtMessageDispatcherTest::testSendMessages_underUploadLimit() { // TODO Because we no longer directly use PeerStorage::calculateStat() // and Neither RequestGroup nor RequestGroupMan can be stubbed, this // test is commented out for now. -// +// // void DefaultBtMessageDispatcherTest::testSendMessages_overUploadLimit() { // btMessageDispatcher->setMaxUploadSpeedLimit(100); // TransferStat stat; @@ -293,14 +293,14 @@ int MY_PIECE_LENGTH = 16*1024; void DefaultBtMessageDispatcherTest::testCheckRequestSlotAndDoNecessaryThing() { SharedHandle piece(new Piece(0, MY_PIECE_LENGTH)); RequestSlot slot(0, 0, MY_PIECE_LENGTH, 0, piece); - + size_t index; CPPUNIT_ASSERT(piece->getMissingUnusedBlockIndex(index)); CPPUNIT_ASSERT_EQUAL((size_t)0, index); SharedHandle pieceStorage(new MockPieceStorage2()); pieceStorage->setPiece(piece); - + btMessageDispatcher->setRequestTimeout(60); btMessageDispatcher->setPieceStorage(pieceStorage); btMessageDispatcher->addOutstandingRequest(slot); @@ -345,7 +345,7 @@ void DefaultBtMessageDispatcherTest::testCheckRequestSlotAndDoNecessaryThing_com piece->completeBlock(0); RequestSlot slot(0, 0, MY_PIECE_LENGTH, 0, piece); - + SharedHandle pieceStorage(new MockPieceStorage2()); pieceStorage->setPiece(piece); @@ -384,8 +384,8 @@ void DefaultBtMessageDispatcherTest::testIsOutstandingRequest() { CPPUNIT_ASSERT(btMessageDispatcher->isOutstandingRequest(0, 0)); CPPUNIT_ASSERT(!btMessageDispatcher->isOutstandingRequest(0, 1)); - CPPUNIT_ASSERT(!btMessageDispatcher->isOutstandingRequest(1, 0)); - CPPUNIT_ASSERT(!btMessageDispatcher->isOutstandingRequest(1, 1)); + CPPUNIT_ASSERT(!btMessageDispatcher->isOutstandingRequest(1, 0)); + CPPUNIT_ASSERT(!btMessageDispatcher->isOutstandingRequest(1, 1)); } void DefaultBtMessageDispatcherTest::testGetOutstandingRequest() { @@ -424,7 +424,7 @@ void DefaultBtMessageDispatcherTest::testRemoveOutstandingRequest() { RequestSlot s3 = btMessageDispatcher->getOutstandingRequest (piece->getIndex(), begin, length); - CPPUNIT_ASSERT(RequestSlot::isNull(s3)); + CPPUNIT_ASSERT(RequestSlot::isNull(s3)); CPPUNIT_ASSERT(!piece->isBlockUsed(blockIndex)); } diff --git a/test/DefaultBtMessageFactoryTest.cc b/test/DefaultBtMessageFactoryTest.cc index 62b24b0a..a4011009 100644 --- a/test/DefaultBtMessageFactoryTest.cc +++ b/test/DefaultBtMessageFactoryTest.cc @@ -61,7 +61,7 @@ void DefaultBtMessageFactoryTest::testCreateBtMessage_BtExtendedMessage() 13, 20); msg[5] = 1; // Set dummy extended message ID 1 memcpy(msg+6, payload.c_str(), payload.size()); - + SharedHandle m (dynamic_pointer_cast (factory_->createBtMessage((const unsigned char*)msg+4, sizeof(msg)))); diff --git a/test/DefaultBtProgressInfoFileTest.cc b/test/DefaultBtProgressInfoFileTest.cc index 9d9b8afd..fa34e294 100644 --- a/test/DefaultBtProgressInfoFileTest.cc +++ b/test/DefaultBtProgressInfoFileTest.cc @@ -52,7 +52,7 @@ private: SharedHandle pieceStorage_; SharedHandle