Revert "Possible fix for coverity #29375"

This reverts commit 27b03ae. It's quite hard to get this working!
SuperTux · Mar 1, 2015 · c01aff7 · c01aff7
1 parent 204bc2e
commit c01aff7
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 89 deletions.
diff --git a/src/lisp/writer.cpp b/src/lisp/writer.cpp
@@ -16,7 +16,7 @@
 
 #include "lisp/writer.hpp"
 
-#include "physfs/buffered_ofile_stream.hpp"
+#include "physfs/ofile_stream.hpp"
 #include "util/log.hpp"
 
 namespace lisp {
@@ -27,8 +27,7 @@ Writer::Writer(const std::string& filename) :
   indent_depth(),
   lists()
 {
-  BufferedOFileStream* filestream = new BufferedOFileStream(filename);
-  out = filestream->get_stream();
+  out = new OFileStream(filename);
   out_owned = true;
   indent_depth = 0;
   out->precision(10);

diff --git a/src/physfs/buffered_ofile_stream.cpp b/src/physfs/buffered_ofile_stream.cpp
diff --git a/src/physfs/buffered_ofile_stream.hpp b/src/physfs/buffered_ofile_stream.hpp
diff --git a/src/physfs/ofile_stream.cpp b/src/physfs/ofile_stream.cpp
@@ -19,8 +19,10 @@
 
 #include "physfs/ofile_stream.hpp"
 
-OFileStream::OFileStream(OFileStreambuf* buf) :
-  std::ostream(buf)
+#include "physfs/ofile_streambuf.hpp"
+
+OFileStream::OFileStream(const std::string& filename) :
+  std::ostream(new OFileStreambuf(filename))
 {
 }
 

diff --git a/src/physfs/ofile_stream.hpp b/src/physfs/ofile_stream.hpp
@@ -19,14 +19,14 @@
 
 #include <ostream>
 #include <physfs.h>
-#include "physfs/ofile_streambuf.hpp"
 
 class OFileStream : public std::ostream
 {
 public:
-  OFileStream(OFileStreambuf* buf);
+  OFileStream(const std::string& filename);
   ~OFileStream();
 };
+
 #endif
 
 /* EOF */