fs/io/Reader: use C++ exceptions instead of class Error

2015-12-16 11:05:33 +01:00
parent fe60c52c70
commit e6e7d6dbd6
33 changed files with 192 additions and 334 deletions
@@ -26,22 +26,18 @@

 #include <assert.h>

-TextFile::TextFile(Path path_fs, Error &error)
-	:file_reader(new FileReader(path_fs, error)),
+TextFile::TextFile(Path path_fs)
+	:file_reader(new FileReader(path_fs)),
 #ifdef ENABLE_ZLIB
-	 gunzip_reader(file_reader->IsDefined()
-		       ? new AutoGunzipReader(*file_reader)
-		       : nullptr),
+	 gunzip_reader(new AutoGunzipReader(*file_reader)),
 #endif
-	 buffered_reader(file_reader->IsDefined()
-			 ? new BufferedReader(*
+	 buffered_reader(new BufferedReader(*
 #ifdef ENABLE_ZLIB
-					      gunzip_reader
+					    gunzip_reader
 #else
-					      file_reader
+					    file_reader
 #endif
-					      )
-			 : nullptr)
+					    ))
 {
 }

@@ -61,11 +57,3 @@ TextFile::ReadLine()

 	return buffered_reader->ReadLine();
 }
-
-bool
-TextFile::Check(Error &error) const
-{
-	assert(buffered_reader != nullptr);
-
-	return buffered_reader->Check(error);
-}