Explorar o código

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
Tatsuhiro Tsujikawa %!s(int64=15) %!d(string=hai) anos
pai
achega
94c4a71d63
Modificáronse 3 ficheiros con 13 adicións e 13 borrados
  1. 7 0
      ChangeLog
  2. 6 11
      src/MultiDiskAdaptor.cc
  3. 0 2
      src/MultiDiskAdaptor.h

+ 7 - 0
ChangeLog

@@ -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>
 
 	Fixed unittest error

+ 6 - 11
src/MultiDiskAdaptor.cc

@@ -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
 (const SharedHandle<DiskWriterEntry>& entry, void (DiskWriterEntry::*open)())
 {
@@ -303,7 +294,9 @@ void MultiDiskAdaptor::openIfNot
 void MultiDiskAdaptor::openFile()
 {
   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
   // created.
   for(DiskWriterEntries::const_iterator itr = diskWriterEntries_.begin(),
@@ -315,7 +308,9 @@ void MultiDiskAdaptor::openFile()
 void MultiDiskAdaptor::initAndOpenFile()
 {
   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.
   for(DiskWriterEntries::const_iterator itr = diskWriterEntries_.begin(),
         eoi = diskWriterEntries_.end(); itr != eoi; ++itr) {

+ 0 - 2
src/MultiDiskAdaptor.h

@@ -128,8 +128,6 @@ private:
 
   void resetDiskWriterEntries();
 
-  void mkdir() const;
-
   void openIfNot(const SharedHandle<DiskWriterEntry>& entry,
                  void (DiskWriterEntry::*f)());