[dovecot-cvs] dovecot/src/lib istream.c,1.5,1.6 istream.h,1.4,1.5 ostream.c,1.6,1.7 ostream.h,1.4,1.5

[cras at procontrol.fi]

Update of /home/cvs/dovecot/src/lib
In directory danu:/tmp/cvs-serv21406

Modified Files:
	istream.c istream.h ostream.c ostream.h 
Log Message:
More type safety to i/o streams



Index: istream.c
===================================================================
RCS file: /home/cvs/dovecot/src/lib/istream.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- istream.c	11 Jan 2003 19:55:56 -0000	1.5
+++ istream.c	23 Jan 2003 19:08:53 -0000	1.6
@@ -28,12 +28,12 @@
 
 void i_stream_ref(struct istream *stream)
 {
-	_io_stream_ref(stream->real_stream);
+	_io_stream_ref(&stream->real_stream->iostream);
 }
 
 void i_stream_unref(struct istream *stream)
 {
-	_io_stream_unref(stream->real_stream);
+	_io_stream_unref(&stream->real_stream->iostream);
 }
 
 int i_stream_get_fd(struct istream *stream)
@@ -45,19 +45,20 @@
 
 void i_stream_close(struct istream *stream)
 {
-	_io_stream_close(stream->real_stream);
+	_io_stream_close(&stream->real_stream->iostream);
 	stream->closed = TRUE;
 }
 
 void i_stream_set_max_buffer_size(struct istream *stream, size_t max_size)
 {
-	_io_stream_set_max_buffer_size(stream->real_stream, max_size);
+	_io_stream_set_max_buffer_size(&stream->real_stream->iostream,
+				       max_size);
 }
 
 void i_stream_set_blocking(struct istream *stream, int timeout_msecs,
 			   void (*timeout_cb)(void *), void *context)
 {
-	_io_stream_set_blocking(stream->real_stream, timeout_msecs,
+	_io_stream_set_blocking(&stream->real_stream->iostream, timeout_msecs,
 				timeout_cb, context);
 }
 

Index: istream.h
===================================================================
RCS file: /home/cvs/dovecot/src/lib/istream.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- istream.h	11 Jan 2003 19:55:56 -0000	1.4
+++ istream.h	23 Jan 2003 19:08:53 -0000	1.5
@@ -8,7 +8,7 @@
 	int stream_errno;
 	unsigned int closed:1;
 
-	void *real_stream;
+	struct _istream *real_stream;
 };
 
 struct istream *i_stream_create_file(int fd, pool_t pool,

Index: ostream.c
===================================================================
RCS file: /home/cvs/dovecot/src/lib/ostream.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- ostream.c	11 Jan 2003 19:55:56 -0000	1.6
+++ ostream.c	23 Jan 2003 19:08:53 -0000	1.7
@@ -29,29 +29,30 @@
 
 void o_stream_ref(struct ostream *stream)
 {
-	_io_stream_ref(stream->real_stream);
+	_io_stream_ref(&stream->real_stream->iostream);
 }
 
 void o_stream_unref(struct ostream *stream)
 {
-	_io_stream_unref(stream->real_stream);
+	_io_stream_unref(&stream->real_stream->iostream);
 }
 
 void o_stream_close(struct ostream *stream)
 {
-	_io_stream_close(stream->real_stream);
+	_io_stream_close(&stream->real_stream->iostream);
 	stream->closed = TRUE;
 }
 
 void o_stream_set_max_buffer_size(struct ostream *stream, size_t max_size)
 {
-	_io_stream_set_max_buffer_size(stream->real_stream, max_size);
+	_io_stream_set_max_buffer_size(&stream->real_stream->iostream,
+				       max_size);
 }
 
 void o_stream_set_blocking(struct ostream *stream, int timeout_msecs,
 			   void (*timeout_cb)(void *), void *context)
 {
-	_io_stream_set_blocking(stream->real_stream, timeout_msecs,
+	_io_stream_set_blocking(&stream->real_stream->iostream, timeout_msecs,
 				timeout_cb, context);
 }
 

Index: ostream.h
===================================================================
RCS file: /home/cvs/dovecot/src/lib/ostream.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ostream.h	11 Jan 2003 19:55:56 -0000	1.4
+++ ostream.h	23 Jan 2003 19:08:53 -0000	1.5
@@ -7,7 +7,7 @@
 	int stream_errno;
 	unsigned int closed:1;
 
-	void *real_stream;
+	struct _ostream *real_stream;
 };
 
 struct ostream *