diff options
| author | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2017-10-07 19:42:43 +0900 |
|---|---|---|
| committer | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2017-10-07 19:42:43 +0900 |
| commit | 64fe98a1ea7f0cfe19eb30e2396f3e0cbe262927 (patch) | |
| tree | a3d6b1149e8cf966265d364d176af1bf7f977354 | |
| parent | 31a2f5cd1b1293c0d08efb38a0b9cfff0df38976 (diff) | |
clang-format
| -rw-r--r-- | src/LibuvEventPoll.cc | 10 | ||||
| -rw-r--r-- | src/OptionHandlerFactory.cc | 4 | ||||
| -rw-r--r-- | src/aria2api.cc | 3 | ||||
| -rw-r--r-- | src/bittorrent_helper.cc | 5 | ||||
| -rw-r--r-- | test/BittorrentHelperTest.cc | 3 |
5 files changed, 12 insertions, 13 deletions
diff --git a/src/LibuvEventPoll.cc b/src/LibuvEventPoll.cc index c50284ef..3065e804 100644 --- a/src/LibuvEventPoll.cc +++ b/src/LibuvEventPoll.cc @@ -65,10 +65,7 @@ template <typename T> static void close_callback(uv_handle_t* handle) delete reinterpret_cast<T*>(handle); } -static void timer_callback(uv_timer_t* handle) -{ - uv_stop(handle->loop); -} +static void timer_callback(uv_timer_t* handle) { uv_stop(handle->loop); } } namespace aria2 { @@ -100,10 +97,7 @@ int LibuvEventPoll::KSocketEntry::getEvents() const return events; } -LibuvEventPoll::LibuvEventPoll() -{ - loop_ = uv_loop_new(); -} +LibuvEventPoll::LibuvEventPoll() { loop_ = uv_loop_new(); } LibuvEventPoll::~LibuvEventPoll() { diff --git a/src/OptionHandlerFactory.cc b/src/OptionHandlerFactory.cc index 9a3197e8..44d1c3bf 100644 --- a/src/OptionHandlerFactory.cc +++ b/src/OptionHandlerFactory.cc @@ -1854,8 +1854,8 @@ std::vector<OptionHandler*> OptionHandlerFactory::createOptionHandlers() handlers.push_back(op); } { - OptionHandler* op(new DefaultOptionHandler( - PREF_PEER_AGENT, TEXT_PEER_AGENT, "aria2/" PACKAGE_VERSION)); + OptionHandler* op(new DefaultOptionHandler(PREF_PEER_AGENT, TEXT_PEER_AGENT, + "aria2/" PACKAGE_VERSION)); op->addTag(TAG_BITTORRENT); handlers.push_back(op); } diff --git a/src/aria2api.cc b/src/aria2api.cc index 75df54cf..bf079277 100644 --- a/src/aria2api.cc +++ b/src/aria2api.cc @@ -722,7 +722,8 @@ struct RequestGroupDH : public DownloadHandle { { return group->getNumConnection(); } - virtual int getErrorCode() CXX11_OVERRIDE { + virtual int getErrorCode() CXX11_OVERRIDE + { return group->getLastErrorCode(); } virtual const std::vector<A2Gid>& getFollowedBy() CXX11_OVERRIDE diff --git a/src/bittorrent_helper.cc b/src/bittorrent_helper.cc index 65cde9b2..c0b1f60b 100644 --- a/src/bittorrent_helper.cc +++ b/src/bittorrent_helper.cc @@ -714,7 +714,10 @@ const std::string& generateStaticPeerAgent(const std::string& peerAgentNew) } void setStaticPeerId(const std::string& newPeerId) { peerId = newPeerId; } -void setStaticPeerAgent(const std::string& newPeerAgent) { peerAgent = newPeerAgent; } +void setStaticPeerAgent(const std::string& newPeerAgent) +{ + peerAgent = newPeerAgent; +} // If PeerID is not generated, it is created with default peerIdPrefix // (aria2-). diff --git a/test/BittorrentHelperTest.cc b/test/BittorrentHelperTest.cc index 5881be24..2ad44808 100644 --- a/test/BittorrentHelperTest.cc +++ b/test/BittorrentHelperTest.cc @@ -331,7 +331,8 @@ void BittorrentHelperTest::testGetPeerAgent() { std::string peerAgent = generateStaticPeerAgent("aria2/-1.-1.-1"); CPPUNIT_ASSERT_EQUAL(std::string("aria2/-1.-1.-1"), peerAgent); - CPPUNIT_ASSERT_EQUAL(std::string("aria2/-1.-1.-1"), bittorrent::getStaticPeerAgent()); + CPPUNIT_ASSERT_EQUAL(std::string("aria2/-1.-1.-1"), + bittorrent::getStaticPeerAgent()); } void BittorrentHelperTest::testComputeFastSet() |