Rename buffered_file to buffered_stream

4 files changed, 29 insertions, 26 deletions

diff --git a/src/backup.cpp b/src/backup.cpp
index 238c3ae..b6b1471 100644
--- a/src/backup.cpp
+++ b/src/backup.cpp
@@ -25,7 +25,7 @@
  */
 
 #include "backup.h"
-#include "buffered_file.h"
+#include "buffered_stream.h"
 #include "format_v2.h"
 
 #include <algorithm>
@@ -77,7 +77,7 @@ class PagedStreamReader
             m_buffers[0] = std::shared_ptr<char[]>(new char[m_page_size_bytes]);
             m_buffers[1] = std::shared_ptr<char[]>(new char[m_page_size_bytes]);
         } catch (const std::bad_alloc &e) {
-            throw BufferedFile::Error(
+            throw BufferedStream::Error(
                 "cannot allocate pages for input stream data");
         }
     };
@@ -114,7 +114,7 @@ class PagedStreamReader
         m_istream.read(data, m_page_size_bytes);
 
         if (!m_istream.good() && !m_istream.eof()) {
-            throw BufferedFile::Error("cannot read from stream");
+            throw BufferedStream::Error("cannot read from stream");
         }
 
         return m_istream.gcount();
@@ -387,13 +387,13 @@ backup(const OptionsBackup &opts)
     std::ifstream in_istream{opts.getInFilePath(),
                              std::ifstream::in | std::ifstream::binary};
     if (!in_istream) {
-        throw BufferedFile::Error("cannot open input file");
+        throw BufferedStream::Error("cannot open input file");
     }
 
     std::ifstream base_istream{opts.getBaseFilePath(),
                                std::ifstream::in | std::ifstream::binary};
     if (!base_istream) {
-        throw BufferedFile::Error("cannot open base file");
+        throw BufferedStream::Error("cannot open base file");
     }
 
     // When backing up, the output file is truncated to hold the new data
@@ -401,7 +401,7 @@ backup(const OptionsBackup &opts)
                                                          std::ofstream::trunc |
                                                          std::ofstream::binary};
     if (!out_ostream) {
-        throw BufferedFile::Error("cannot open output file");
+        throw BufferedStream::Error("cannot open output file");
     }
 
     DiffFinder diff_finder(base_istream, in_istream, opts.getBufferSize(),
diff --git a/src/buffered_file.cpp b/src/buffered_stream.cpp
index 5ab5094..371e221 100644
--- a/src/buffered_file.cpp
+++ b/src/buffered_stream.cpp
@@ -24,7 +24,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "buffered_file.h"
+#include "buffered_stream.h"
 #include "exception.h"
 
 #include <algorithm>
@@ -33,7 +33,7 @@
 #include <filesystem>
 #include <fstream>
 
-namespace BufferedFile
+namespace BufferedStream
 {
 
 Reader::Reader(std::istream &istream, size_t buffer_capacity)
@@ -43,7 +43,7 @@ Reader::Reader(std::istream &istream, size_t buffer_capacity)
     try {
         m_buffer = std::make_unique<char[]>(m_buffer_capacity);
     } catch (const std::bad_alloc &e) {
-        throw Error("cannot allocate buffer for input file data");
+        throw Error("cannot allocate buffer for input stream data");
     }
 };
 
@@ -99,17 +99,17 @@ Reader::read_buffer(size_t data_size, char **return_data)
 void
 Reader::refill_buffer()
 {
-    m_buffer_size = read_file(m_buffer.get(), m_buffer_capacity);
+    m_buffer_size = read_stream(m_buffer.get(), m_buffer_capacity);
     m_buffer_offset = 0;
 };
 
 size_t
-Reader::read_file(char *data, size_t data_size)
+Reader::read_stream(char *data, size_t data_size)
 {
     m_istream.read(data, data_size);
 
     if (!m_istream.good() && !m_istream.eof()) {
-        throw Error("cannot read from file");
+        throw Error("cannot read from stream");
     }
 
     return m_istream.gcount();
@@ -121,7 +121,7 @@ Writer::Writer(std::ostream &ostream, size_t buffer_capacity)
     try {
         m_buffer = std::make_unique<char[]>(m_buffer_capacity);
     } catch (const std::bad_alloc &e) {
-        throw Error("cannot allocate buffer for output file data");
+        throw Error("cannot allocate buffer for output stream data");
     }
 };
 Writer::~Writer() { flush_buffer(); };
@@ -141,7 +141,7 @@ Writer::write(const char *data, size_t data_size)
             write_buffer(data, data_size);
         } else {
             // Doesn't fit
-            write_file(data, data_size);
+            write_stream(data, data_size);
         }
     }
 };
@@ -157,17 +157,17 @@ Writer::write_buffer(const char *data, size_t data_size)
 void
 Writer::flush_buffer()
 {
-    write_file(m_buffer.get(), m_buffer_size);
+    write_stream(m_buffer.get(), m_buffer_size);
     m_buffer_size = 0;
 };
 
 void
-Writer::write_file(const char *data, size_t data_size)
+Writer::write_stream(const char *data, size_t data_size)
 {
     m_ostream.write(data, data_size);
     if (!m_ostream) {
-        throw Error("cannot write to output file");
+        throw Error("cannot write to output stream");
     }
 };
 
-} // namespace BufferedFile
+} // namespace BufferedStream
diff --git a/src/buffered_file.h b/src/buffered_stream.h
index 23fa823..4b05a64 100644
--- a/src/buffered_file.h
+++ b/src/buffered_stream.h
@@ -32,7 +32,7 @@
 #include <filesystem>
 #include <fstream>
 
-namespace BufferedFile
+namespace BufferedStream
 {
 
 class Error : public DiffddError
@@ -59,7 +59,7 @@ class Reader
 
     size_t read_buffer(size_t data_size, char **return_data);
     void refill_buffer();
-    size_t read_file(char *data, size_t data_size);
+    size_t read_stream(char *data, size_t data_size);
 };
 
 class Writer
@@ -78,7 +78,7 @@ class Writer
 
     void write_buffer(const char *data, size_t data_size);
     void flush_buffer();
-    void write_file(const char *data, size_t data_size);
+    void write_stream(const char *data, size_t data_size);
 };
 
-} // namespace BufferedFile
+} // namespace BufferedStream
diff --git a/src/format_v2.h b/src/format_v2.h
index a455035..4c3b7dc 100644
--- a/src/format_v2.h
+++ b/src/format_v2.h
@@ -24,6 +24,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "buffered_stream.h"
+
 #include <endian.h>
 
 #include <vector>
@@ -42,7 +44,7 @@ class Writer
 {
   public:
     Writer(std::ostream &ostream, size_t buffer_size)
-        : m_writer{BufferedFile::Writer{ostream, buffer_size}} {};
+        : m_writer{BufferedStream::Writer{ostream, buffer_size}} {};
 
     void writeDiffRecord(
         uint64_t offset, size_t size,
@@ -56,7 +58,7 @@ class Writer
     }
 
   private:
-    BufferedFile::Writer m_writer;
+    BufferedStream::Writer m_writer;
 
     void writeOffset(uint64_t offset)
     {
@@ -80,7 +82,8 @@ class Reader
 {
   public:
     Reader(std::istream &istream, size_t buffer_size)
-        : m_reader{BufferedFile::Reader{istream, buffer_size}}, m_eof{false} {};
+        : m_reader{BufferedStream::Reader{istream, buffer_size}}, m_eof{
+                                                                      false} {};
 
     bool eof() { return m_eof; };
 
@@ -112,7 +115,7 @@ class Reader
     };
 
   private:
-    BufferedFile::Reader m_reader;
+    BufferedStream::Reader m_reader;
     bool m_eof;
 };