X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fio%2Fzlibcompressed.h;h=da7313b4c42a62a3838045b0737eefbb919f7044;hb=5763dd6e8089c97699cbcbd221afb7fe1841bcdd;hp=30894cb9cf2345e7e5d79ed742dfe74e115ab99c;hpb=e0266badf098a5cec2512eb693bca771e35fd3ab;p=libs%2Fcore.git

diff --git a/source/io/zlibcompressed.h b/source/io/zlibcompressed.h
index 30894cb..da7313b 100644
--- a/source/io/zlibcompressed.h
+++ b/source/io/zlibcompressed.h
@@ -12,13 +12,13 @@ namespace IO {
 class zlib_error: public std::runtime_error
 {
 private:
-	int code_;
+	int m_code;
 
 public:
 	zlib_error(const std::string &, int);
-	~zlib_error() throw() { }
+	virtual ~zlib_error() throw() = default;
 
-	int code() const throw() { return code_; }
+	int code() const throw() { return m_code; }
 };
 
 /**
@@ -34,32 +34,31 @@ private:
 	struct Private;
 
 	Base &below;
-	unsigned buffer_size;
-	unsigned char *in_buffer;
-	unsigned char *out_buffer;
-	bool stream_end;
-	Private *priv;
+	std::size_t buffer_size = 1024;
+	unsigned char *in_buffer = 0;
+	unsigned char *out_buffer = 0;
+	bool stream_end = false;
+	Private *priv = 0;
 
 public:
 	/** Creates a zlib de/compression object.  The underlying object must be
 	open for reading or writing, not both.  The level parameter determines
 	compression quality, ranging from 1 (fastest) to 9 (best compression). */
-	ZlibCompressed(Base &, unsigned level = 9);
+	ZlibCompressed(Base &b, unsigned level = 9): ZlibCompressed(b, b.get_mode()&M_RDWR, level) { }
 
 	/** Creates a zlib de/compression object.  Mode must be either read or
 	write, and compatible with the underlying object. */
 	ZlibCompressed(Base &, Mode, unsigned level = 9);
 
-private:
-	void init(unsigned);
-
-public:
 	virtual ~ZlibCompressed();
 
+	virtual void set_block(bool);
+	virtual void set_inherit(bool);
+
 	void flush();
 
 protected:
-	virtual unsigned do_write(const char *, unsigned);
+	virtual std::size_t do_write(const char *, std::size_t);
 
 private:
 	/** Compresses data and writes it to the underlying object.  Returns true if
@@ -69,7 +68,9 @@ private:
 	bool compress_data(int flush_mode);
 
 public:
-	virtual unsigned do_read(char *, unsigned);
+	virtual std::size_t do_read(char *, std::size_t);
+
+	virtual const Handle &get_handle(Mode);
 };
 
 } // namespace IO