From d3a04d10a72b00487eb3c994bd3d0405e11c4789 Mon Sep 17 00:00:00 2001 From: Tatsuhiro Tsujikawa Date: Fri, 5 Jul 2013 22:42:47 +0900 Subject: [PATCH] DefaultPieceStorage::initStorage: Clean up --- src/DefaultPieceStorage.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/DefaultPieceStorage.cc b/src/DefaultPieceStorage.cc index 8af48b8e..8188d26a 100644 --- a/src/DefaultPieceStorage.cc +++ b/src/DefaultPieceStorage.cc @@ -637,7 +637,7 @@ void DefaultPieceStorage::initStorage() { if(downloadContext_->getFileEntries().size() == 1) { A2_LOG_DEBUG("Instantiating DirectDiskAdaptor"); - DirectDiskAdaptor* directDiskAdaptor(new DirectDiskAdaptor()); + auto directDiskAdaptor = make_unique(); directDiskAdaptor->setTotalLength(downloadContext_->getTotalLength()); directDiskAdaptor->setFileEntries (downloadContext_->getFileEntries().begin(), @@ -645,16 +645,16 @@ void DefaultPieceStorage::initStorage() directDiskAdaptor->setDiskWriter (diskWriterFactory_->newDiskWriter(directDiskAdaptor->getFilePath())); - diskAdaptor_.reset(directDiskAdaptor); + diskAdaptor_ = std::move(directDiskAdaptor); } else { A2_LOG_DEBUG("Instantiating MultiDiskAdaptor"); - MultiDiskAdaptor* multiDiskAdaptor(new MultiDiskAdaptor()); + auto multiDiskAdaptor = make_unique(); multiDiskAdaptor->setFileEntries(downloadContext_->getFileEntries().begin(), downloadContext_->getFileEntries().end()); multiDiskAdaptor->setPieceLength(downloadContext_->getPieceLength()); multiDiskAdaptor->setMaxOpenFiles (option_->getAsInt(PREF_BT_MAX_OPEN_FILES)); - diskAdaptor_.reset(multiDiskAdaptor); + diskAdaptor_ = std::move(multiDiskAdaptor); } if(option_->get(PREF_FILE_ALLOCATION) == V_FALLOC) { diskAdaptor_->setFileAllocationMethod(DiskAdaptor::FILE_ALLOC_FALLOC);