Common close function

Author: arahlin

core/include/core/dataio.h

@@ -35,14 +35,6 @@ g3_istream_from_path(std::istream &stream, const std::string &path,
  */
 int g3_istream_handle(std::istream &stream);
 
-/**
- * Clean up the input stream.
- *
- * @param  stream   A reference to the input stream, as configured by
- *                  g3_istream_from_path.
- */
-void g3_istream_close(std::istream &stream);
-
 /**
  * Configure a filtering stream for G3Frame compression to a local file.
  *
@@ -60,12 +52,12 @@ g3_ostream_to_path(std::ostream &stream, const std::string &path, bool append=fa
     size_t buffersize=1024*1024, const std::string &ext=".g3");
 
 /**
- * Clean up the output stream.
+ * Clean up the IO stream.
  *
- * @param  stream   A reference to the output stream, as configured by
- *                  g3_istream_from_path.
+ * @param  stream   A reference to the IO stream, as configured by
+ *                  g3_istream_from_path or g3_ostream_to_path.
  */
-void g3_ostream_close(std::ostream &stream);
+void g3_stream_close(std::ios &stream);
 
 /**
  * Check that the input filename is a valid filename on disk.

core/src/G3MultiFileWriter.cxx

@@ -77,7 +77,7 @@ G3MultiFileWriter::G3MultiFileWriter(boost::python::object filename,
 
 G3MultiFileWriter::~G3MultiFileWriter()
 {
-	g3_ostream_close(stream_);
+	g3_stream_close(stream_);
 }
 
 bool
@@ -103,7 +103,7 @@ G3MultiFileWriter::CheckNewFile(G3FramePtr frame)
 			return false;
 	}
 
-	g3_ostream_close(stream_);
+	g3_stream_close(stream_);
 
 	std::string filename;
 	if (filename_ != "") {
@@ -137,7 +137,7 @@ void G3MultiFileWriter::Process(G3FramePtr frame, std::deque<G3FramePtr> &out)
 	bool new_file(false), meta_cached(false);
 
 	if (frame->type == G3Frame::EndProcessing) {
-		g3_ostream_close(stream_);
+		g3_stream_close(stream_);
 		goto done;
 	}
 

core/src/G3Reader.cxx

@@ -31,7 +31,7 @@ G3Reader::G3Reader(const std::vector<std::string> &filename, int n_frames_to_rea
 
 G3Reader::~G3Reader()
 {
-	g3_istream_close(stream_);
+	g3_stream_close(stream_);
 }
 
 void G3Reader::StartFile(const std::string &path)

core/src/G3Writer.cxx

@@ -13,7 +13,7 @@ G3Writer::G3Writer(std::string filename,
 
 G3Writer::~G3Writer()
 {
-	g3_ostream_close(stream_);
+	g3_stream_close(stream_);
 }
 
 void G3Writer::Process(G3FramePtr frame, std::deque<G3FramePtr> &out)
@@ -27,7 +27,7 @@ void G3Writer::Process(G3FramePtr frame, std::deque<G3FramePtr> &out)
 	G3PythonContext ctx("G3Writer", false);
 
 	if (frame->type == G3Frame::EndProcessing)
-		g3_ostream_close(stream_);
+		g3_stream_close(stream_);
 	else if (streams_.size() == 0 ||
 	    std::find(streams_.begin(), streams_.end(), frame->type) !=
 	    streams_.end())

core/src/dataio.cxx

@@ -290,7 +290,7 @@ void
 g3_istream_from_path(std::istream &stream, const std::string &path, float timeout,
     size_t buffersize, const std::string &ext)
 {
-	g3_istream_close(stream);
+	g3_stream_close(stream);
 
 	std::streambuf *sbuf = nullptr;
 
@@ -337,15 +337,6 @@ g3_istream_handle(std::istream &stream)
 	return rbuf->fd();
 }
 
-void
-g3_istream_close(std::istream &stream)
-{
-	std::streambuf* sbuf = stream.rdbuf();
-	if (sbuf)
-		delete sbuf;
-	stream.rdbuf(nullptr);
-}
-
 class OutputFileStreamCounter : public std::streambuf {
 public:
 	OutputFileStreamCounter(const std::string& path, size_t size, bool append)
@@ -408,6 +399,8 @@ void
 g3_ostream_to_path(std::ostream &stream, const std::string &path, bool append,
     size_t buffersize, const std::string &ext)
 {
+	g3_stream_close(stream);
+
 	std::streambuf *sbuf = nullptr;
 
 	Codec codec = get_codec(path, ext);
@@ -439,7 +432,7 @@ g3_ostream_to_path(std::ostream &stream, const std::string &path, bool append,
 }
 
 void
-g3_ostream_close(std::ostream &stream)
+g3_stream_close(std::ios &stream)
 {
 	std::streambuf* sbuf = stream.rdbuf();
 	if (sbuf)

gcp/src/ARCFileReader.cxx

@@ -165,7 +165,7 @@ ARCFileReader::ARCFileReader(const std::vector<std::string> &filename,
 
 ARCFileReader::~ARCFileReader()
 {
-	g3_istream_close(stream_);
+	g3_stream_close(stream_);
 }