Factor "buffered streambuf" interface from fdbuf to bufstreambuf

Also rename fdbuf to fdstreambuf for consistency.

1 files changed, 6 insertions, 6 deletions

diff --git a/libbutl/sha1.cxx b/libbutl/sha1.cxx
index 6a5e9db..f4a6bad 100644
--- a/libbutl/sha1.cxx
+++ b/libbutl/sha1.cxx
@@ -47,6 +47,8 @@ extern "C"
 #include <string>
 #include <cstddef>
 #include <cstdint>
+
+#include <istream>
 #endif
 
 // Other includes.
@@ -60,10 +62,8 @@ module butl.sha1;
 import std.core;
 #endif
 #endif
-
-import butl.fdstream;
 #else
-#include <libbutl/fdstream.mxx>
+#include <libbutl/bufstreambuf.hxx>
 #endif
 
 using namespace std;
@@ -91,12 +91,12 @@ namespace butl
   }
 
   void sha1::
-  append (ifdstream& is)
+  append (istream& is)
   {
-    fdbuf* buf (dynamic_cast<fdbuf*> (is.rdbuf ()));
+    bufstreambuf* buf (dynamic_cast<bufstreambuf*> (is.rdbuf ()));
     assert (buf != nullptr);
 
-    while (is.peek () != ifdstream::traits_type::eof () && is.good ())
+    while (is.peek () != istream::traits_type::eof () && is.good ())
     {
       size_t n (buf->egptr () - buf->gptr ());
       append (buf->gptr (), n);