mirror of https://github.com/aria2/aria2
2010-11-25 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
Removed MultiDiskAdaptor::mkdir() because directory structure is created at AbstractDiskWriter::createFile(). * src/MultiDiskAdaptor.cc * src/MultiDiskAdaptor.hpull/1/head
parent
63c84509b9
commit
94c4a71d63
|
@ -1,3 +1,10 @@
|
||||||
|
2010-11-25 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
|
||||||
|
|
||||||
|
Removed MultiDiskAdaptor::mkdir() because directory structure is
|
||||||
|
created at AbstractDiskWriter::createFile().
|
||||||
|
* src/MultiDiskAdaptor.cc
|
||||||
|
* src/MultiDiskAdaptor.h
|
||||||
|
|
||||||
2010-11-25 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
|
2010-11-25 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
|
||||||
|
|
||||||
Fixed unittest error
|
Fixed unittest error
|
||||||
|
|
|
@ -263,15 +263,6 @@ void MultiDiskAdaptor::resetDiskWriterEntries()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void MultiDiskAdaptor::mkdir() const
|
|
||||||
{
|
|
||||||
for(std::vector<SharedHandle<DiskWriterEntry> >::const_iterator i =
|
|
||||||
diskWriterEntries_.begin(), eoi = diskWriterEntries_.end();
|
|
||||||
i != eoi; ++i) {
|
|
||||||
(*i)->getFileEntry()->setupDir();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void MultiDiskAdaptor::openIfNot
|
void MultiDiskAdaptor::openIfNot
|
||||||
(const SharedHandle<DiskWriterEntry>& entry, void (DiskWriterEntry::*open)())
|
(const SharedHandle<DiskWriterEntry>& entry, void (DiskWriterEntry::*open)())
|
||||||
{
|
{
|
||||||
|
@ -303,7 +294,9 @@ void MultiDiskAdaptor::openIfNot
|
||||||
void MultiDiskAdaptor::openFile()
|
void MultiDiskAdaptor::openFile()
|
||||||
{
|
{
|
||||||
resetDiskWriterEntries();
|
resetDiskWriterEntries();
|
||||||
mkdir();
|
// util::mkdir() is called in AbstractDiskWriter::createFile(), so
|
||||||
|
// we don't need to call it here.
|
||||||
|
|
||||||
// Call DiskWriterEntry::openFile to make sure that zero-length files are
|
// Call DiskWriterEntry::openFile to make sure that zero-length files are
|
||||||
// created.
|
// created.
|
||||||
for(DiskWriterEntries::const_iterator itr = diskWriterEntries_.begin(),
|
for(DiskWriterEntries::const_iterator itr = diskWriterEntries_.begin(),
|
||||||
|
@ -315,7 +308,9 @@ void MultiDiskAdaptor::openFile()
|
||||||
void MultiDiskAdaptor::initAndOpenFile()
|
void MultiDiskAdaptor::initAndOpenFile()
|
||||||
{
|
{
|
||||||
resetDiskWriterEntries();
|
resetDiskWriterEntries();
|
||||||
mkdir();
|
// util::mkdir() is called in AbstractDiskWriter::createFile(), so
|
||||||
|
// we don't need to call it here.
|
||||||
|
|
||||||
// Call DiskWriterEntry::initAndOpenFile to make files truncated.
|
// Call DiskWriterEntry::initAndOpenFile to make files truncated.
|
||||||
for(DiskWriterEntries::const_iterator itr = diskWriterEntries_.begin(),
|
for(DiskWriterEntries::const_iterator itr = diskWriterEntries_.begin(),
|
||||||
eoi = diskWriterEntries_.end(); itr != eoi; ++itr) {
|
eoi = diskWriterEntries_.end(); itr != eoi; ++itr) {
|
||||||
|
|
|
@ -128,8 +128,6 @@ private:
|
||||||
|
|
||||||
void resetDiskWriterEntries();
|
void resetDiskWriterEntries();
|
||||||
|
|
||||||
void mkdir() const;
|
|
||||||
|
|
||||||
void openIfNot(const SharedHandle<DiskWriterEntry>& entry,
|
void openIfNot(const SharedHandle<DiskWriterEntry>& entry,
|
||||||
void (DiskWriterEntry::*f)());
|
void (DiskWriterEntry::*f)());
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue