github
/
aria2
mirror of https://github.com/aria2/aria2
1
0
Fork 0
Code Issues Releases Wiki Activity

DefaultPieceStorage::initStorage: Clean up

pull/106/head
Tatsuhiro Tsujikawa 2013-07-05 22:42:47 +09:00
parent ae84ff26e2
commit d3a04d10a7
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/DefaultPieceStorage.cc
View File

@ -637,7 +637,7 @@ void DefaultPieceStorage::initStorage()
{ {
if(downloadContext_->getFileEntries().size() == 1) { if(downloadContext_->getFileEntries().size() == 1) {
A2_LOG_DEBUG("Instantiating DirectDiskAdaptor"); A2_LOG_DEBUG("Instantiating DirectDiskAdaptor");
DirectDiskAdaptor* directDiskAdaptor(new DirectDiskAdaptor()); auto directDiskAdaptor = make_unique<DirectDiskAdaptor>();
directDiskAdaptor->setTotalLength(downloadContext_->getTotalLength()); directDiskAdaptor->setTotalLength(downloadContext_->getTotalLength());
directDiskAdaptor->setFileEntries directDiskAdaptor->setFileEntries
(downloadContext_->getFileEntries().begin(), (downloadContext_->getFileEntries().begin(),
@ -645,16 +645,16 @@ void DefaultPieceStorage::initStorage()
directDiskAdaptor->setDiskWriter directDiskAdaptor->setDiskWriter
(diskWriterFactory_->newDiskWriter(directDiskAdaptor->getFilePath())); (diskWriterFactory_->newDiskWriter(directDiskAdaptor->getFilePath()));
diskAdaptor_.reset(directDiskAdaptor); diskAdaptor_ = std::move(directDiskAdaptor);
} else { } else {
A2_LOG_DEBUG("Instantiating MultiDiskAdaptor"); A2_LOG_DEBUG("Instantiating MultiDiskAdaptor");
MultiDiskAdaptor* multiDiskAdaptor(new MultiDiskAdaptor()); auto multiDiskAdaptor = make_unique<MultiDiskAdaptor>();
multiDiskAdaptor->setFileEntries(downloadContext_->getFileEntries().begin(), multiDiskAdaptor->setFileEntries(downloadContext_->getFileEntries().begin(),
downloadContext_->getFileEntries().end()); downloadContext_->getFileEntries().end());
multiDiskAdaptor->setPieceLength(downloadContext_->getPieceLength()); multiDiskAdaptor->setPieceLength(downloadContext_->getPieceLength());
multiDiskAdaptor->setMaxOpenFiles multiDiskAdaptor->setMaxOpenFiles
(option_->getAsInt(PREF_BT_MAX_OPEN_FILES)); (option_->getAsInt(PREF_BT_MAX_OPEN_FILES));
diskAdaptor_.reset(multiDiskAdaptor); diskAdaptor_ = std::move(multiDiskAdaptor);
} }
if(option_->get(PREF_FILE_ALLOCATION) == V_FALLOC) { if(option_->get(PREF_FILE_ALLOCATION) == V_FALLOC) {
diskAdaptor_->setFileAllocationMethod(DiskAdaptor::FILE_ALLOC_FALLOC); diskAdaptor_->setFileAllocationMethod(DiskAdaptor::FILE_ALLOC_FALLOC);