diff --git a/ChangeLog b/ChangeLog index 3f0a30a3..deea0d2f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2008-05-12 Tatsuhiro Tsujikawa + + Changed method sinature: + RequestGroup::getURIs + * src/RequestGroup.cc + * src/RequestGroup.h + * test/Metalink2RequestGroupTest.cc + 2008-05-12 Tatsuhiro Tsujikawa Changed method signature: diff --git a/src/RequestGroup.cc b/src/RequestGroup.cc index e761ea28..5498f6c8 100644 --- a/src/RequestGroup.cc +++ b/src/RequestGroup.cc @@ -754,11 +754,10 @@ void RequestGroup::initializePostDownloadHandler() #endif // ENABLE_METALINK } -std::deque RequestGroup::getUris() const +void RequestGroup::getURIs(std::deque& uris) const { - std::deque temp(_spentUris.begin(), _spentUris.end()); - temp.insert(temp.end(), _uris.begin(), _uris.end()); - return temp; + uris.insert(uris.end(), _spentUris.begin(), _spentUris.end()); + uris.insert(uris.end(), _uris.begin(), _uris.end()); } bool RequestGroup::isDependencyResolved() @@ -853,7 +852,8 @@ bool RequestGroup::needsFileAllocation() const DownloadResultHandle RequestGroup::createDownloadResult() const { - std::deque uris = getUris(); + std::deque uris; + getURIs(uris); return SharedHandle(new DownloadResult(_gid, getFilePath(), diff --git a/src/RequestGroup.h b/src/RequestGroup.h index 96ef2163..2f2fb175 100644 --- a/src/RequestGroup.h +++ b/src/RequestGroup.h @@ -179,7 +179,7 @@ public: return _spentUris; } - std::deque getUris() const; + void getURIs(std::deque& uris) const; /** * Compares expected filename with specified actualFilename. diff --git a/test/Metalink2RequestGroupTest.cc b/test/Metalink2RequestGroupTest.cc index 4a2ec4f2..4db07edd 100644 --- a/test/Metalink2RequestGroupTest.cc +++ b/test/Metalink2RequestGroupTest.cc @@ -37,7 +37,8 @@ void Metalink2RequestGroupTest::testGenerate() // first file { SharedHandle rg = groups[0]; - std::deque uris = rg->getUris(); + std::deque uris; + rg->getURIs(uris); std::sort(uris.begin(), uris.end()); CPPUNIT_ASSERT_EQUAL((size_t)2, uris.size()); CPPUNIT_ASSERT_EQUAL(std::string("ftp://ftphost/aria2-0.5.2.tar.bz2"), uris[0]); @@ -55,7 +56,8 @@ void Metalink2RequestGroupTest::testGenerate() // second file { SharedHandle rg = groups[1]; - std::deque uris = rg->getUris(); + std::deque uris; + rg->getURIs(uris); CPPUNIT_ASSERT_EQUAL((size_t)2, uris.size()); SharedHandle dctx (dynamic_pointer_cast(rg->getDownloadContext())); @@ -73,7 +75,8 @@ void Metalink2RequestGroupTest::testGenerate() // fifth file <- downloading .torrent file { SharedHandle rg = groups[4]; - std::deque uris = rg->getUris(); + std::deque uris; + rg->getURIs(uris); CPPUNIT_ASSERT_EQUAL((size_t)1, uris.size()); CPPUNIT_ASSERT_EQUAL(std::string("http://host/torrent-http.integrated.torrent"), uris[0]); @@ -90,7 +93,8 @@ void Metalink2RequestGroupTest::testGenerate() #else SharedHandle rg = groups[4]; #endif // ENABLE_BITTORRENT - std::deque uris = rg->getUris(); + std::deque uris; + rg->getURIs(uris); CPPUNIT_ASSERT_EQUAL((size_t)1, uris.size()); CPPUNIT_ASSERT_EQUAL(std::string("http://host/torrent-http.integrated"), uris[0]); SharedHandle dctx