Mercurial > dovecot > original-hg > dovecot-1.2

changeset 6415:b0096861c390 HEAD

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Renamed struct _[io]stream to struct [io]stream_private. Also removed _ prefix from _[io]stream_*() functions.
author Timo Sirainen <tss@iki.fi>
date Sun, 16 Sep 2007 12:22:27 +0300
parents a6a49d5efc59
children 298e651e18de
files src/lib-mail/istream-header-filter.c src/lib-storage/index/mbox/istream-raw-mbox.c src/lib/iostream-internal.h src/lib/iostream.c src/lib/istream-data.c src/lib/istream-file.c src/lib/istream-internal.h src/lib/istream-limit.c src/lib/istream-mmap.c src/lib/istream-seekable.c src/lib/istream-tee.c src/lib/istream.c src/lib/istream.h src/lib/ostream-crlf.c src/lib/ostream-file.c src/lib/ostream-internal.h src/lib/ostream.c src/lib/ostream.h src/plugins/zlib/istream-zlib.c
diffstat 19 files changed, 213 insertions(+), 198 deletions(-) [+]
line wrap: on
line diff
--- a/src/lib-mail/istream-header-filter.c	Sun Sep 16 12:09:30 2007 +0300
+++ b/src/lib-mail/istream-header-filter.c	Sun Sep 16 12:22:27 2007 +0300
@@ -9,7 +9,7 @@
 #include <stdlib.h>
 
 struct header_filter_istream {
-	struct _istream istream;
+	struct istream_private istream;
 	pool_t pool;
 
 	struct istream *input;
@@ -37,11 +37,11 @@
 
 header_filter_callback *null_header_filter_callback = NULL;
 
-static void _close(struct _iostream *stream ATTR_UNUSED)
+static void _close(struct iostream_private *stream ATTR_UNUSED)
 {
 }
 
-static void _destroy(struct _iostream *stream)
+static void _destroy(struct iostream_private *stream)
 {
 	struct header_filter_istream *mstream =
 		(struct header_filter_istream *)stream;
@@ -52,7 +52,8 @@
 	pool_unref(mstream->pool);
 }
 
-static void _set_max_buffer_size(struct _iostream *stream, size_t max_size)
+static void
+_set_max_buffer_size(struct iostream_private *stream, size_t max_size)
 {
 	struct header_filter_istream *mstream =
 		(struct header_filter_istream *)stream;
@@ -204,7 +205,7 @@
 	return ret;
 }
 
-static ssize_t _read(struct _istream *stream)
+static ssize_t _read(struct istream_private *stream)
 {
 	struct header_filter_istream *mstream =
 		(struct header_filter_istream *)stream;
@@ -263,7 +264,7 @@
 	}
 }
 
-static void _seek(struct _istream *stream, uoff_t v_offset,
+static void _seek(struct istream_private *stream, uoff_t v_offset,
 		  bool mark ATTR_UNUSED)
 {
 	struct header_filter_istream *mstream =
@@ -295,13 +296,13 @@
 }
 
 static void ATTR_NORETURN
-_sync(struct _istream *stream ATTR_UNUSED)
+_sync(struct istream_private *stream ATTR_UNUSED)
 {
 	i_panic("istream-header-filter sync() not implemented");
 }
 
 static const struct stat *
-_stat(struct _istream *stream, bool exact)
+_stat(struct istream_private *stream, bool exact)
 {
 	struct header_filter_istream *mstream =
 		(struct header_filter_istream *)stream;
@@ -364,5 +365,5 @@
 
 	mstream->istream.istream.blocking = input->blocking;
 	mstream->istream.istream.seekable = input->seekable;
-	return _i_stream_create(&mstream->istream, -1, 0);
+	return i_stream_create(&mstream->istream, -1, 0);
 }
--- a/src/lib-storage/index/mbox/istream-raw-mbox.c	Sun Sep 16 12:09:30 2007 +0300
+++ b/src/lib-storage/index/mbox/istream-raw-mbox.c	Sun Sep 16 12:22:27 2007 +0300
@@ -7,7 +7,7 @@
 #include "mbox-from.h"
 
 struct raw_mbox_istream {
-	struct _istream istream;
+	struct istream_private istream;
 
 	time_t received_time, next_received_time;
 	char *sender, *next_sender;
@@ -22,11 +22,11 @@
 	unsigned int eof:1;
 };
 
-static void _close(struct _iostream *stream ATTR_UNUSED)
+static void _close(struct iostream_private *stream ATTR_UNUSED)
 {
 }
 
-static void _destroy(struct _iostream *stream)
+static void _destroy(struct iostream_private *stream)
 {
 	struct raw_mbox_istream *rstream = (struct raw_mbox_istream *)stream;
 
@@ -37,7 +37,8 @@
 	i_stream_unref(&rstream->input);
 }
 
-static void _set_max_buffer_size(struct _iostream *stream, size_t max_size)
+static void
+_set_max_buffer_size(struct iostream_private *stream, size_t max_size)
 {
 	struct raw_mbox_istream *rstream = (struct raw_mbox_istream *)stream;
 
@@ -121,7 +122,7 @@
 	}
 }
 
-static ssize_t _read(struct _istream *stream)
+static ssize_t _read(struct istream_private *stream)
 {
 	static const char *mbox_from = "\nFrom ";
 	struct raw_mbox_istream *rstream = (struct raw_mbox_istream *)stream;
@@ -306,7 +307,7 @@
 	return ret;
 }
 
-static void _seek(struct _istream *stream, uoff_t v_offset,
+static void _seek(struct istream_private *stream, uoff_t v_offset,
 		  bool mark ATTR_UNUSED)
 {
 	struct raw_mbox_istream *rstream = (struct raw_mbox_istream *)stream;
@@ -319,7 +320,7 @@
 	rstream->eof = FALSE;
 }
 
-static void _sync(struct _istream *stream)
+static void _sync(struct istream_private *stream)
 {
 	struct raw_mbox_istream *rstream = (struct raw_mbox_istream *)stream;
 
@@ -329,7 +330,7 @@
 	rstream->istream.pos = 0;
 }
 
-static const struct stat *_stat(struct _istream *stream, bool exact)
+static const struct stat *_stat(struct istream_private *stream, bool exact)
 {
 	struct raw_mbox_istream *rstream = (struct raw_mbox_istream *)stream;
 	const struct stat *st;
@@ -370,8 +371,8 @@
 
 	rstream->istream.istream.blocking = input->blocking;
 	rstream->istream.istream.seekable = input->seekable;
-	return _i_stream_create(&rstream->istream, -1,
-				input->real_stream->abs_start_offset);
+	return i_stream_create(&rstream->istream, -1,
+			       input->real_stream->abs_start_offset);
 }
 
 static int istream_raw_mbox_is_valid_from(struct raw_mbox_istream *rstream)
--- a/src/lib/iostream-internal.h	Sun Sep 16 12:09:30 2007 +0300
+++ b/src/lib/iostream-internal.h	Sun Sep 16 12:22:27 2007 +0300
@@ -3,18 +3,20 @@
 
 /* This file is private to input stream and output stream implementations */
 
-struct _iostream {
+struct iostream_private {
 	int refcount;
 
-	void (*close)(struct _iostream *stream);
-	void (*destroy)(struct _iostream *stream);
-	void (*set_max_buffer_size)(struct _iostream *stream, size_t max_size);
+	void (*close)(struct iostream_private *stream);
+	void (*destroy)(struct iostream_private *stream);
+	void (*set_max_buffer_size)(struct iostream_private *stream,
+				    size_t max_size);
 };
 
-void _io_stream_init(struct _iostream *stream);
-void _io_stream_ref(struct _iostream *stream);
-void _io_stream_unref(struct _iostream *stream);
-void _io_stream_close(struct _iostream *stream);
-void _io_stream_set_max_buffer_size(struct _iostream *stream, size_t max_size);
+void io_stream_init(struct iostream_private *stream);
+void io_stream_ref(struct iostream_private *stream);
+void io_stream_unref(struct iostream_private *stream);
+void io_stream_close(struct iostream_private *stream);
+void io_stream_set_max_buffer_size(struct iostream_private *stream,
+				   size_t max_size);
 
 #endif
--- a/src/lib/iostream.c	Sun Sep 16 12:09:30 2007 +0300
+++ b/src/lib/iostream.c	Sun Sep 16 12:22:27 2007 +0300
@@ -3,17 +3,17 @@
 #include "lib.h"
 #include "iostream-internal.h"
 
-void _io_stream_init(struct _iostream *stream)
+void io_stream_init(struct iostream_private *stream)
 {
 	stream->refcount = 1;
 }
 
-void _io_stream_ref(struct _iostream *stream)
+void io_stream_ref(struct iostream_private *stream)
 {
 	stream->refcount++;
 }
 
-void _io_stream_unref(struct _iostream *stream)
+void io_stream_unref(struct iostream_private *stream)
 {
 	i_assert(stream->refcount > 0);
 	if (--stream->refcount != 0)
@@ -25,12 +25,13 @@
         i_free(stream);
 }
 
-void _io_stream_close(struct _iostream *stream)
+void io_stream_close(struct iostream_private *stream)
 {
 	stream->close(stream);
 }
 
-void _io_stream_set_max_buffer_size(struct _iostream *stream, size_t max_size)
+void io_stream_set_max_buffer_size(struct iostream_private *stream,
+				   size_t max_size)
 {
 	stream->set_max_buffer_size(stream, max_size);
 }
--- a/src/lib/istream-data.c	Sun Sep 16 12:09:30 2007 +0300
+++ b/src/lib/istream-data.c	Sun Sep 16 12:22:27 2007 +0300
@@ -3,21 +3,21 @@
 #include "lib.h"
 #include "istream-internal.h"
 
-static void _close(struct _iostream *stream ATTR_UNUSED)
+static void _close(struct iostream_private *stream ATTR_UNUSED)
 {
 }
 
-static void _destroy(struct _iostream *stream ATTR_UNUSED)
+static void _destroy(struct iostream_private *stream ATTR_UNUSED)
 {
 }
 
-static ssize_t _read(struct _istream *stream ATTR_UNUSED)
+static ssize_t _read(struct istream_private *stream ATTR_UNUSED)
 {
 	stream->istream.eof = TRUE;
 	return -1;
 }
 
-static void _seek(struct _istream *stream, uoff_t v_offset,
+static void _seek(struct istream_private *stream, uoff_t v_offset,
 		  bool mark ATTR_UNUSED)
 {
 	stream->skip = v_offset;
@@ -26,9 +26,9 @@
 
 struct istream *i_stream_create_from_data(const void *data, size_t size)
 {
-	struct _istream *stream;
+	struct istream_private *stream;
 
-	stream = i_new(struct _istream, 1);
+	stream = i_new(struct istream_private, 1);
 	stream->buffer = data;
 	stream->pos = size;
 
@@ -40,7 +40,7 @@
 
 	stream->istream.blocking = TRUE;
 	stream->istream.seekable = TRUE;
-	(void)_i_stream_create(stream, -1, 0);
+	(void)i_stream_create(stream, -1, 0);
 	stream->statbuf.st_size = size;
 	return &stream->istream;
 }
--- a/src/lib/istream-file.c	Sun Sep 16 12:09:30 2007 +0300
+++ b/src/lib/istream-file.c	Sun Sep 16 12:22:27 2007 +0300
@@ -12,7 +12,7 @@
 #include <sys/stat.h>
 
 struct file_istream {
-	struct _istream istream;
+	struct istream_private istream;
 
 	uoff_t skip_left;
 
@@ -20,10 +20,10 @@
 	unsigned int autoclose_fd:1;
 };
 
-static void _close(struct _iostream *stream)
+static void _close(struct iostream_private *stream)
 {
-	struct file_istream *fstream = (struct file_istream *) stream;
-	struct _istream *_stream = (struct _istream *) stream;
+	struct file_istream *fstream = (struct file_istream *)stream;
+	struct istream_private *_stream = (struct istream_private *)stream;
 
 	if (fstream->autoclose_fd && _stream->fd != -1) {
 		if (close(_stream->fd) < 0)
@@ -32,14 +32,14 @@
 	_stream->fd = -1;
 }
 
-static void _destroy(struct _iostream *stream)
+static void _destroy(struct iostream_private *stream)
 {
-	struct _istream *_stream = (struct _istream *) stream;
+	struct istream_private *_stream = (struct istream_private *)stream;
 
 	i_free(_stream->w_buffer);
 }
 
-static ssize_t _read(struct _istream *stream)
+static ssize_t _read(struct istream_private *stream)
 {
 	struct file_istream *fstream = (struct file_istream *) stream;
 	size_t size;
@@ -53,11 +53,11 @@
 	if (stream->pos == stream->buffer_size) {
 		if (stream->skip > 0) {
 			/* remove the unused bytes from beginning of buffer */
-                        _i_stream_compress(stream);
+                        i_stream_compress(stream);
 		} else if (stream->max_buffer_size == 0 ||
 			   stream->buffer_size < stream->max_buffer_size) {
 			/* buffer is full - grow it */
-			_i_stream_grow_buffer(stream, I_STREAM_MIN_SIZE);
+			i_stream_grow_buffer(stream, I_STREAM_MIN_SIZE);
 		}
 
 		if (stream->pos == stream->buffer_size)
@@ -116,7 +116,7 @@
 	return ret;
 }
 
-static void _seek(struct _istream *stream, uoff_t v_offset,
+static void _seek(struct istream_private *stream, uoff_t v_offset,
 		  bool mark ATTR_UNUSED)
 {
 	struct file_istream *fstream = (struct file_istream *) stream;
@@ -134,7 +134,7 @@
 	stream->skip = stream->pos = 0;
 }
 
-static void _sync(struct _istream *stream)
+static void _sync(struct istream_private *stream)
 {
 	if (!stream->istream.seekable) {
 		/* can't do anything or data would be lost */
@@ -145,7 +145,7 @@
 }
 
 static const struct stat *
-_stat(struct _istream *stream, bool exact ATTR_UNUSED)
+_stat(struct istream_private *stream, bool exact ATTR_UNUSED)
 {
 	struct file_istream *fstream = (struct file_istream *) stream;
 
@@ -184,5 +184,5 @@
 		fstream->istream.istream.seekable = TRUE;
 	}
 
-	return _i_stream_create(&fstream->istream, fd, 0);
+	return i_stream_create(&fstream->istream, fd, 0);
 }
--- a/src/lib/istream-internal.h	Sun Sep 16 12:09:30 2007 +0300
+++ b/src/lib/istream-internal.h	Sun Sep 16 12:22:27 2007 +0300
@@ -6,15 +6,16 @@
 
 #define I_STREAM_MIN_SIZE 4096
 
-struct _istream {
+struct istream_private {
 /* inheritance: */
-	struct _iostream iostream;
+	struct iostream_private iostream;
 
 /* methods: */
-	ssize_t (*read)(struct _istream *stream);
-	void (*seek)(struct _istream *stream, uoff_t v_offset, bool mark);
-	void (*sync)(struct _istream *stream);
-	const struct stat *(*stat)(struct _istream *stream, bool exact);
+	ssize_t (*read)(struct istream_private *stream);
+	void (*seek)(struct istream_private *stream,
+		     uoff_t v_offset, bool mark);
+	void (*sync)(struct istream_private *stream);
+	const struct stat *(*stat)(struct istream_private *stream, bool exact);
 
 /* data: */
 	struct istream istream;
@@ -33,9 +34,10 @@
 };
 
 struct istream *
-_i_stream_create(struct _istream *_buf, int fd, uoff_t abs_start_offset);
+i_stream_create(struct istream_private *stream,
+		int fd, uoff_t abs_start_offset);
 
-void _i_stream_compress(struct _istream *stream);
-void _i_stream_grow_buffer(struct _istream *stream, size_t bytes);
+void i_stream_compress(struct istream_private *stream);
+void i_stream_grow_buffer(struct istream_private *stream, size_t bytes);
 
 #endif
--- a/src/lib/istream-limit.c	Sun Sep 16 12:09:30 2007 +0300
+++ b/src/lib/istream-limit.c	Sun Sep 16 12:22:27 2007 +0300
@@ -4,17 +4,17 @@
 #include "istream-internal.h"
 
 struct limit_istream {
-	struct _istream istream;
+	struct istream_private istream;
 
 	struct istream *input;
 	uoff_t v_start_offset, v_size;
 };
 
-static void _close(struct _iostream *stream ATTR_UNUSED)
+static void _close(struct iostream_private *stream ATTR_UNUSED)
 {
 }
 
-static void _destroy(struct _iostream *stream)
+static void _destroy(struct iostream_private *stream)
 {
 	struct limit_istream *lstream = (struct limit_istream *) stream;
 
@@ -24,14 +24,15 @@
 	i_stream_unref(&lstream->input);
 }
 
-static void _set_max_buffer_size(struct _iostream *stream, size_t max_size)
+static void
+_set_max_buffer_size(struct iostream_private *stream, size_t max_size)
 {
 	struct limit_istream *lstream = (struct limit_istream *) stream;
 
 	i_stream_set_max_buffer_size(lstream->input, max_size);
 }
 
-static ssize_t _read(struct _istream *stream)
+static ssize_t _read(struct istream_private *stream)
 {
 	struct limit_istream *lstream = (struct limit_istream *) stream;
 	uoff_t left;
@@ -81,7 +82,7 @@
 	return ret;
 }
 
-static void _seek(struct _istream *stream, uoff_t v_offset,
+static void _seek(struct istream_private *stream, uoff_t v_offset,
 		  bool mark ATTR_UNUSED)
 {
 	struct limit_istream *lstream = (struct limit_istream *) stream;
@@ -93,7 +94,7 @@
 	stream->skip = stream->pos = 0;
 }
 
-static const struct stat *_stat(struct _istream *stream, bool exact)
+static const struct stat *_stat(struct istream_private *stream, bool exact)
 {
 	struct limit_istream *lstream = (struct limit_istream *) stream;
 	const struct stat *st;
@@ -135,7 +136,7 @@
 
 	lstream->istream.istream.blocking = input->blocking;
 	lstream->istream.istream.seekable = input->seekable;
-	return _i_stream_create(&lstream->istream, i_stream_get_fd(input),
-				input->real_stream->abs_start_offset +
-				v_start_offset);
+	return i_stream_create(&lstream->istream, i_stream_get_fd(input),
+			       input->real_stream->abs_start_offset +
+			       v_start_offset);
 }
--- a/src/lib/istream-mmap.c	Sun Sep 16 12:09:30 2007 +0300
+++ b/src/lib/istream-mmap.c	Sun Sep 16 12:22:27 2007 +0300
@@ -9,7 +9,7 @@
 #include <sys/stat.h>
 
 struct mmap_istream {
-	struct _istream istream;
+	struct istream_private istream;
 
         struct timeval fstat_cache_stamp;
 
@@ -22,7 +22,7 @@
 
 static size_t mmap_pagemask = 0;
 
-static void _close(struct _iostream *stream)
+static void _close(struct iostream_private *stream)
 {
 	struct mmap_istream *mstream = (struct mmap_istream *) stream;
 
@@ -35,7 +35,7 @@
 
 static void i_stream_munmap(struct mmap_istream *mstream)
 {
-	struct _istream *_stream = &mstream->istream;
+	struct istream_private *_stream = &mstream->istream;
 
 	if (_stream->buffer != NULL) {
 		if (munmap(mstream->mmap_base, _stream->buffer_size) < 0)
@@ -47,20 +47,20 @@
 	}
 }
 
-static void _destroy(struct _iostream *stream)
+static void _destroy(struct iostream_private *stream)
 {
 	struct mmap_istream *mstream = (struct mmap_istream *) stream;
 
 	i_stream_munmap(mstream);
 }
 
-static size_t mstream_get_mmap_block_size(struct _istream *stream)
+static size_t mstream_get_mmap_block_size(struct istream_private *stream)
 {
 	return (stream->max_buffer_size + mmap_get_page_size() - 1) & ~
 		(mmap_get_page_size() - 1);
 }
 
-static ssize_t _read(struct _istream *stream)
+static ssize_t _read(struct istream_private *stream)
 {
 	struct mmap_istream *mstream = (struct mmap_istream *) stream;
 	size_t aligned_skip;
@@ -130,7 +130,7 @@
 	return stream->pos - stream->skip;
 }
 
-static void _seek(struct _istream *stream, uoff_t v_offset,
+static void _seek(struct istream_private *stream, uoff_t v_offset,
 		  bool mark ATTR_UNUSED)
 {
 	struct mmap_istream *mstream = (struct mmap_istream *) stream;
@@ -149,7 +149,7 @@
 	stream->istream.v_offset = v_offset;
 }
 
-static void _sync(struct _istream *stream)
+static void _sync(struct istream_private *stream)
 {
 	struct mmap_istream *mstream = (struct mmap_istream *) stream;
 
@@ -175,7 +175,7 @@
 }
 
 static const struct stat *
-_stat(struct _istream *stream, bool exact ATTR_UNUSED)
+_stat(struct istream_private *stream, bool exact ATTR_UNUSED)
 {
 	struct mmap_istream *mstream = (struct mmap_istream *) stream;
 
@@ -220,7 +220,7 @@
 	mstream->istream.sync = _sync;
 	mstream->istream.stat = _stat;
 
-	istream = _i_stream_create(&mstream->istream, fd, start_offset);
+	istream = i_stream_create(&mstream->istream, fd, start_offset);
 	istream->mmaped = TRUE;
 	istream->blocking = TRUE;
 	istream->seekable = TRUE;
--- a/src/lib/istream-seekable.c	Sun Sep 16 12:09:30 2007 +0300
+++ b/src/lib/istream-seekable.c	Sun Sep 16 12:22:27 2007 +0300
@@ -16,7 +16,7 @@
 #define BUF_INITIAL_SIZE (1024*32)
 
 struct seekable_istream {
-	struct _istream istream;
+	struct istream_private istream;
 
 	size_t max_buffer_size;
 	char *temp_prefix;
@@ -29,7 +29,7 @@
 	int fd;
 };
 
-static void _close(struct _iostream *stream ATTR_UNUSED)
+static void _close(struct iostream_private *stream ATTR_UNUSED)
 {
 	struct seekable_istream *sstream = (struct seekable_istream *)stream;
 	unsigned int i;
@@ -41,7 +41,7 @@
 		i_stream_close(sstream->input[i]);
 }
 
-static void _destroy(struct _iostream *stream)
+static void _destroy(struct iostream_private *stream)
 {
 	struct seekable_istream *sstream = (struct seekable_istream *)stream;
 	unsigned int i;
@@ -56,7 +56,8 @@
 	i_free(sstream->temp_prefix);
 }
 
-static void _set_max_buffer_size(struct _iostream *stream, size_t max_size)
+static void
+_set_max_buffer_size(struct iostream_private *stream, size_t max_size)
 {
 	struct seekable_istream *sstream = (struct seekable_istream *)stream;
 	unsigned int i;
@@ -161,7 +162,7 @@
 
 static bool read_from_buffer(struct seekable_istream *sstream, ssize_t *ret)
 {
-	struct _istream *stream = &sstream->istream;
+	struct istream_private *stream = &sstream->istream;
 	const unsigned char *data;
 	size_t size, pos, offset;
 
@@ -191,7 +192,7 @@
 	return TRUE;
 }
 
-static ssize_t _read(struct _istream *stream)
+static ssize_t _read(struct istream_private *stream)
 {
 	struct seekable_istream *sstream = (struct seekable_istream *)stream;
 	const unsigned char *data;
@@ -250,7 +251,7 @@
 	return ret;
 }
 
-static void _seek(struct _istream *stream, uoff_t v_offset,
+static void _seek(struct istream_private *stream, uoff_t v_offset,
 		  bool mark ATTR_UNUSED)
 {
 	stream->istream.stream_errno = 0;
@@ -258,7 +259,7 @@
 	stream->skip = stream->pos = 0;
 }
 
-static const struct stat *_stat(struct _istream *stream, bool exact)
+static const struct stat *_stat(struct istream_private *stream, bool exact)
 {
 	struct seekable_istream *sstream = (struct seekable_istream *)stream;
 	uoff_t old_offset;
@@ -326,5 +327,5 @@
 	sstream->istream.seek = _seek;
 	sstream->istream.stat = _stat;
 
-	return _i_stream_create(&sstream->istream, -1, 0);
+	return i_stream_create(&sstream->istream, -1, 0);
 }
--- a/src/lib/istream-tee.c	Sun Sep 16 12:09:30 2007 +0300
+++ b/src/lib/istream-tee.c	Sun Sep 16 12:22:27 2007 +0300
@@ -12,7 +12,7 @@
 };
 
 struct tee_child_istream {
-	struct _istream istream;
+	struct istream_private istream;
 
 	struct tee_istream *tee;
 	struct tee_child_istream *next;
@@ -58,14 +58,14 @@
 	}
 }
 
-static void _close(struct _iostream *stream)
+static void _close(struct iostream_private *stream)
 {
 	struct tee_child_istream *tstream = (struct tee_child_istream *)stream;
 
 	tee_streams_skip(tstream->tee);
 }
 
-static void _destroy(struct _iostream *stream)
+static void _destroy(struct iostream_private *stream)
 {
 	struct tee_child_istream *tstream = (struct tee_child_istream *)stream;
 	struct tee_istream *tee = tstream->tee;
@@ -93,14 +93,15 @@
 	}
 }
 
-static void _set_max_buffer_size(struct _iostream *stream, size_t max_size)
+static void
+_set_max_buffer_size(struct iostream_private *stream, size_t max_size)
 {
 	struct tee_child_istream *tstream = (struct tee_child_istream *)stream;
 
 	return i_stream_set_max_buffer_size(tstream->tee->input, max_size);
 }
 
-static ssize_t _read(struct _istream *stream)
+static ssize_t _read(struct istream_private *stream)
 {
 	struct tee_child_istream *tstream = (struct tee_child_istream *)stream;
 	struct istream *input = tstream->tee->input;
@@ -142,20 +143,20 @@
 }
 
 static void ATTR_NORETURN
-_seek(struct _istream *stream ATTR_UNUSED,
+_seek(struct istream_private *stream ATTR_UNUSED,
       uoff_t v_offset ATTR_UNUSED, bool mark ATTR_UNUSED)
 {
 	i_panic("tee-istream: seeking unsupported currently");
 }
 
-static const struct stat *_stat(struct _istream *stream, bool exact)
+static const struct stat *_stat(struct istream_private *stream, bool exact)
 {
 	struct tee_child_istream *tstream = (struct tee_child_istream *)stream;
 
 	return i_stream_stat(tstream->tee->input, exact);
 }
 
-static void _sync(struct _istream *stream)
+static void _sync(struct istream_private *stream)
 {
 	struct tee_child_istream *tstream = (struct tee_child_istream *)stream;
 	size_t size;
@@ -199,6 +200,6 @@
 	tstream->next = tee->children;
 	tee->children = tstream;
 
-	return _i_stream_create(&tstream->istream,
-				i_stream_get_fd(tee->input), 0);
+	return i_stream_create(&tstream->istream,
+			       i_stream_get_fd(tee->input), 0);
 }
--- a/src/lib/istream.c	Sun Sep 16 12:09:30 2007 +0300
+++ b/src/lib/istream.c	Sun Sep 16 12:22:27 2007 +0300
@@ -13,43 +13,42 @@
 
 void i_stream_ref(struct istream *stream)
 {
-	_io_stream_ref(&stream->real_stream->iostream);
+	io_stream_ref(&stream->real_stream->iostream);
 }
 
 void i_stream_unref(struct istream **stream)
 {
-	struct _istream *_stream = (*stream)->real_stream;
+	struct istream_private *_stream = (*stream)->real_stream;
 
 	if (_stream->iostream.refcount == 1) {
 		if (_stream->line_str != NULL)
 			str_free(&_stream->line_str);
 	}
-	_io_stream_unref(&(*stream)->real_stream->iostream);
+	io_stream_unref(&(*stream)->real_stream->iostream);
 	*stream = NULL;
 }
 
 int i_stream_get_fd(struct istream *stream)
 {
-	struct _istream *_stream = stream->real_stream;
+	struct istream_private *_stream = stream->real_stream;
 
 	return _stream->fd;
 }
 
 void i_stream_close(struct istream *stream)
 {
-	_io_stream_close(&stream->real_stream->iostream);
+	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->iostream,
-				       max_size);
+	io_stream_set_max_buffer_size(&stream->real_stream->iostream, max_size);
 }
 
 ssize_t i_stream_read(struct istream *stream)
 {
-	struct _istream *_stream = stream->real_stream;
+	struct istream_private *_stream = stream->real_stream;
 
 	if (stream->closed)
 		return -1;
@@ -60,7 +59,7 @@
 
 void i_stream_skip(struct istream *stream, uoff_t count)
 {
-	struct _istream *_stream = stream->real_stream;
+	struct istream_private *_stream = stream->real_stream;
 	size_t data_size;
 
 	data_size = _stream->pos - _stream->skip;
@@ -84,7 +83,7 @@
 
 void i_stream_seek(struct istream *stream, uoff_t v_offset)
 {
-	struct _istream *_stream = stream->real_stream;
+	struct istream_private *_stream = stream->real_stream;
 
 	if (v_offset >= stream->v_offset) {
 		i_stream_skip(stream, v_offset - stream->v_offset);
@@ -100,7 +99,7 @@
 
 void i_stream_seek_mark(struct istream *stream, uoff_t v_offset)
 {
-	struct _istream *_stream = stream->real_stream;
+	struct istream_private *_stream = stream->real_stream;
 
 	if (stream->closed)
 		return;
@@ -111,7 +110,7 @@
 
 void i_stream_sync(struct istream *stream)
 {
-	struct _istream *_stream = stream->real_stream;
+	struct istream_private *_stream = stream->real_stream;
 
 	if (!stream->closed && _stream->sync != NULL)
 		_stream->sync(_stream);
@@ -119,7 +118,7 @@
 
 const struct stat *i_stream_stat(struct istream *stream, bool exact)
 {
-	struct _istream *_stream = stream->real_stream;
+	struct istream_private *_stream = stream->real_stream;
 
 	if (stream->closed)
 		return NULL;
@@ -129,12 +128,12 @@
 
 bool i_stream_have_bytes_left(struct istream *stream)
 {
-	struct _istream *_stream = stream->real_stream;
+	struct istream_private *_stream = stream->real_stream;
 
 	return !stream->eof || _stream->skip != _stream->pos;
 }
 
-static char *i_stream_next_line_finish(struct _istream *stream, size_t i)
+static char *i_stream_next_line_finish(struct istream_private *stream, size_t i)
 {
 	char *ret;
 	size_t end;
@@ -166,7 +165,7 @@
 
 char *i_stream_next_line(struct istream *stream)
 {
-	struct _istream *_stream = stream->real_stream;
+	struct istream_private *_stream = stream->real_stream;
 	char *ret_buf;
         size_t i;
 
@@ -208,7 +207,7 @@
 
 const unsigned char *i_stream_get_data(struct istream *stream, size_t *size_r)
 {
-	struct _istream *_stream = stream->real_stream;
+	struct istream_private *_stream = stream->real_stream;
 
 	if (_stream->skip >= _stream->pos) {
 		*size_r = 0;
@@ -222,7 +221,7 @@
 unsigned char *i_stream_get_modifiable_data(struct istream *stream,
 					    size_t *size_r)
 {
-	struct _istream *_stream = stream->real_stream;
+	struct istream_private *_stream = stream->real_stream;
 
 	if (_stream->skip >= _stream->pos || _stream->w_buffer == NULL) {
 		*size_r = 0;
@@ -261,7 +260,7 @@
 	return -1;
 }
 
-void _i_stream_compress(struct _istream *stream)
+void i_stream_compress(struct istream_private *stream)
 {
 	memmove(stream->w_buffer, stream->w_buffer + stream->skip,
 		stream->pos - stream->skip);
@@ -270,7 +269,7 @@
 	stream->skip = 0;
 }
 
-void _i_stream_grow_buffer(struct _istream *stream, size_t bytes)
+void i_stream_grow_buffer(struct istream_private *stream, size_t bytes)
 {
 	size_t old_size;
 
@@ -290,21 +289,23 @@
 		i_realloc(stream->w_buffer, old_size, stream->buffer_size);
 }
 
-static void _set_max_buffer_size(struct _iostream *stream, size_t max_size)
+static void
+_set_max_buffer_size(struct iostream_private *stream, size_t max_size)
 {
-	struct _istream *_stream = (struct _istream *) stream;
+	struct istream_private *_stream = (struct istream_private *)stream;
 
 	_stream->max_buffer_size = max_size;
 }
 
 static const struct stat *
-_stat(struct _istream *stream, bool exact ATTR_UNUSED)
+_stat(struct istream_private *stream, bool exact ATTR_UNUSED)
 {
 	return &stream->statbuf;
 }
 
 struct istream *
-_i_stream_create(struct _istream *_stream, int fd, uoff_t abs_start_offset)
+i_stream_create(struct istream_private *_stream,
+		int fd, uoff_t abs_start_offset)
 {
 	_stream->fd = fd;
 	_stream->abs_start_offset = abs_start_offset;
@@ -321,7 +322,7 @@
 		_stream->statbuf.st_mtime =
 		_stream->statbuf.st_ctime = ioloop_time;
 
-	_io_stream_init(&_stream->iostream);
+	io_stream_init(&_stream->iostream);
 	return &_stream->istream;
 }
 
--- a/src/lib/istream.h	Sun Sep 16 12:09:30 2007 +0300
+++ b/src/lib/istream.h	Sun Sep 16 12:22:27 2007 +0300
@@ -15,7 +15,7 @@
 	unsigned int eof:1; /* read() has reached to end of file
 	                       (but may still be data available in buffer) */
 
-	struct _istream *real_stream;
+	struct istream_private *real_stream;
 };
 
 struct istream *i_stream_create_fd(int fd, size_t max_buffer_size,
--- a/src/lib/ostream-crlf.c	Sun Sep 16 12:09:30 2007 +0300
+++ b/src/lib/ostream-crlf.c	Sun Sep 16 12:22:27 2007 +0300
@@ -12,7 +12,7 @@
 #define IOVBUF_COUNT 64
 
 struct crlf_ostream {
-	struct _ostream ostream;
+	struct ostream_private ostream;
 
         struct ostream *output;
 	bool last_cr;
@@ -20,25 +20,26 @@
 
 static const struct const_iovec cr_iov = { "\r", 1 };
 
-static void _close(struct _iostream *stream ATTR_UNUSED)
+static void _close(struct iostream_private *stream ATTR_UNUSED)
 {
 }
 
-static void _destroy(struct _iostream *stream)
+static void _destroy(struct iostream_private *stream)
 {
 	struct crlf_ostream *cstream = (struct crlf_ostream *)stream;
 
 	o_stream_unref(&cstream->output);
 }
 
-static void _set_max_buffer_size(struct _iostream *stream, size_t max_size)
+static void
+_set_max_buffer_size(struct iostream_private *stream, size_t max_size)
 {
 	struct crlf_ostream *cstream = (struct crlf_ostream *)stream;
 
 	o_stream_set_max_buffer_size(cstream->output, max_size);
 }
 
-static void _cork(struct _ostream *stream, bool set)
+static void _cork(struct ostream_private *stream, bool set)
 {
 	struct crlf_ostream *cstream = (struct crlf_ostream *)stream;
 
@@ -48,28 +49,28 @@
 		o_stream_uncork(cstream->output);
 }
 
-static int _flush(struct _ostream *stream)
+static int _flush(struct ostream_private *stream)
 {
 	struct crlf_ostream *cstream = (struct crlf_ostream *)stream;
 
 	return o_stream_flush(cstream->output);
 }
 
-static void _flush_pending(struct _ostream *stream, bool set)
+static void _flush_pending(struct ostream_private *stream, bool set)
 {
 	struct crlf_ostream *cstream = (struct crlf_ostream *)stream;
 
 	o_stream_set_flush_pending(cstream->output, set);
 }
 
-static size_t _get_used_size(struct _ostream *stream)
+static size_t _get_used_size(struct ostream_private *stream)
 {
 	struct crlf_ostream *cstream = (struct crlf_ostream *)stream;
 
 	return o_stream_get_buffer_used_size(cstream->output);
 }
 
-static int _seek(struct _ostream *stream, uoff_t offset)
+static int _seek(struct ostream_private *stream, uoff_t offset)
 {
 	struct crlf_ostream *cstream = (struct crlf_ostream *)stream;
 	int ret;
@@ -109,7 +110,7 @@
 }
 
 static ssize_t
-_sendv_crlf(struct _ostream *stream, const struct const_iovec *iov,
+_sendv_crlf(struct ostream_private *stream, const struct const_iovec *iov,
 	    unsigned int iov_count)
 {
 	struct crlf_ostream *cstream = (struct crlf_ostream *)stream;
@@ -218,7 +219,7 @@
 }
 
 static ssize_t
-_sendv_lf(struct _ostream *stream, const struct const_iovec *iov,
+_sendv_lf(struct ostream_private *stream, const struct const_iovec *iov,
 	  unsigned int iov_count)
 {
 	struct crlf_ostream *cstream = (struct crlf_ostream *)stream;
@@ -319,7 +320,7 @@
 }
 
 static off_t
-_send_istream(struct _ostream *outstream, struct istream *instream)
+_send_istream(struct ostream_private *outstream, struct istream *instream)
 {
 	struct const_iovec iov;
         const unsigned char *data;
@@ -374,7 +375,7 @@
 
 	cstream = o_stream_create_common(output);
 	cstream->ostream.sendv = _sendv_crlf;
-	return _o_stream_create(&cstream->ostream);
+	return o_stream_create(&cstream->ostream);
 }
 
 struct ostream *o_stream_create_lf(struct ostream *output)
@@ -383,5 +384,5 @@
 
 	cstream = o_stream_create_common(output);
 	cstream->ostream.sendv = _sendv_lf;
-	return _o_stream_create(&cstream->ostream);
+	return o_stream_create(&cstream->ostream);
 }
--- a/src/lib/ostream-file.c	Sun Sep 16 12:09:30 2007 +0300
+++ b/src/lib/ostream-file.c	Sun Sep 16 12:22:27 2007 +0300
@@ -29,7 +29,7 @@
 	((size) < SSIZE_T_MAX ? (size_t)(size) : SSIZE_T_MAX)
 
 struct file_ostream {
-	struct _ostream ostream;
+	struct ostream_private ostream;
 
 	int fd;
 	struct io *io;
@@ -66,7 +66,7 @@
 	fstream->ostream.ostream.closed = TRUE;
 }
 
-static void _close(struct _iostream *stream)
+static void _close(struct iostream_private *stream)
 {
 	struct file_ostream *fstream = (struct file_ostream *)stream;
 
@@ -76,14 +76,15 @@
 	stream_closed(fstream);
 }
 
-static void _destroy(struct _iostream *stream)
+static void _destroy(struct iostream_private *stream)
 {
 	struct file_ostream *fstream = (struct file_ostream *)stream;
 
 	i_free(fstream->buffer);
 }
 
-static void _set_max_buffer_size(struct _iostream *stream, size_t max_size)
+static void
+_set_max_buffer_size(struct iostream_private *stream, size_t max_size)
 {
 	struct file_ostream *fstream = (struct file_ostream *)stream;
 
@@ -262,7 +263,7 @@
 	return IS_STREAM_EMPTY(fstream) ? 1 : 0;
 }
 
-static void _cork(struct _ostream *stream, bool set)
+static void _cork(struct ostream_private *stream, bool set)
 {
 	struct file_ostream *fstream = (struct file_ostream *)stream;
 	int ret;
@@ -291,14 +292,14 @@
 	}
 }
 
-static int _flush(struct _ostream *stream)
+static int _flush(struct ostream_private *stream)
 {
 	struct file_ostream *fstream = (struct file_ostream *) stream;
 
 	return buffer_flush(fstream);
 }
 
-static void _flush_pending(struct _ostream *stream, bool set)
+static void _flush_pending(struct ostream_private *stream, bool set)
 {
 	struct file_ostream *fstream = (struct file_ostream *) stream;
 
@@ -323,14 +324,14 @@
 	}
 }
 
-static size_t _get_used_size(struct _ostream *stream)
+static size_t _get_used_size(struct ostream_private *stream)
 {
 	struct file_ostream *fstream = (struct file_ostream *)stream;
 
 	return fstream->buffer_size - get_unused_space(fstream);
 }
 
-static int _seek(struct _ostream *stream, uoff_t offset)
+static int _seek(struct ostream_private *stream, uoff_t offset)
 {
 	struct file_ostream *fstream = (struct file_ostream *)stream;
 
@@ -459,7 +460,8 @@
 	return sent;
 }
 
-static ssize_t _sendv(struct _ostream *stream, const struct const_iovec *iov,
+static ssize_t _sendv(struct ostream_private *stream,
+		      const struct const_iovec *iov,
 		      unsigned int iov_count)
 {
 	struct file_ostream *fstream = (struct file_ostream *)stream;
@@ -525,7 +527,7 @@
 	return ret;
 }
 
-static off_t io_stream_sendfile(struct _ostream *outstream,
+static off_t io_stream_sendfile(struct ostream_private *outstream,
 				struct istream *instream,
 				int in_fd, uoff_t in_size)
 {
@@ -575,7 +577,7 @@
 	return ret < 0 ? -1 : (off_t)(instream->v_offset - start_offset);
 }
 
-static off_t io_stream_copy(struct _ostream *outstream,
+static off_t io_stream_copy(struct ostream_private *outstream,
 			    struct istream *instream, uoff_t in_size)
 {
 	struct file_ostream *foutstream = (struct file_ostream *)outstream;
@@ -637,7 +639,7 @@
 	return (off_t) (instream->v_offset - start_offset);
 }
 
-static off_t io_stream_copy_backwards(struct _ostream *outstream,
+static off_t io_stream_copy_backwards(struct ostream_private *outstream,
 				      struct istream *instream, uoff_t in_size)
 {
 	struct file_ostream *foutstream = (struct file_ostream *)outstream;
@@ -712,7 +714,8 @@
 	return (off_t) (in_size - in_start_offset);
 }
 
-static off_t _send_istream(struct _ostream *outstream, struct istream *instream)
+static off_t _send_istream(struct ostream_private *outstream,
+			   struct istream *instream)
 {
 	struct file_ostream *foutstream = (struct file_ostream *)outstream;
 	const struct stat *st;
@@ -823,7 +826,7 @@
 
 	fstream = o_stream_create_fd_common(fd, autoclose_fd);
 	fstream->max_buffer_size = max_buffer_size;
-	ostream = _o_stream_create(&fstream->ostream);
+	ostream = o_stream_create(&fstream->ostream);
 
 	offset = lseek(fd, 0, SEEK_CUR);
 	if (offset >= 0) {
@@ -859,7 +862,7 @@
 	fstream->real_offset = offset;
 	fstream->buffer_offset = offset;
 
-	ostream = _o_stream_create(&fstream->ostream);
+	ostream = o_stream_create(&fstream->ostream);
 	ostream->offset = offset;
 	return ostream;
 }
--- a/src/lib/ostream-internal.h	Sun Sep 16 12:09:30 2007 +0300
+++ b/src/lib/ostream-internal.h	Sun Sep 16 12:22:27 2007 +0300
@@ -4,19 +4,20 @@
 #include "ostream.h"
 #include "iostream-internal.h"
 
-struct _ostream {
+struct ostream_private {
 /* inheritance: */
-	struct _iostream iostream;
+	struct iostream_private iostream;
 
 /* methods: */
-	void (*cork)(struct _ostream *stream, bool set);
-	int (*flush)(struct _ostream *stream);
-	void (*flush_pending)(struct _ostream *stream, bool set);
-	size_t (*get_used_size)(struct _ostream *stream);
-	int (*seek)(struct _ostream *stream, uoff_t offset);
-	ssize_t (*sendv)(struct _ostream *stream, const struct const_iovec *iov,
+	void (*cork)(struct ostream_private *stream, bool set);
+	int (*flush)(struct ostream_private *stream);
+	void (*flush_pending)(struct ostream_private *stream, bool set);
+	size_t (*get_used_size)(struct ostream_private *stream);
+	int (*seek)(struct ostream_private *stream, uoff_t offset);
+	ssize_t (*sendv)(struct ostream_private *stream,
+			 const struct const_iovec *iov,
 			 unsigned int iov_count);
-	off_t (*send_istream)(struct _ostream *outstream,
+	off_t (*send_istream)(struct ostream_private *outstream,
 			      struct istream *instream);
 
 /* data: */
@@ -26,6 +27,6 @@
 	void *context;
 };
 
-struct ostream *_o_stream_create(struct _ostream *_stream);
+struct ostream *o_stream_create(struct ostream_private *_stream);
 
 #endif
--- a/src/lib/ostream.c	Sun Sep 16 12:09:30 2007 +0300
+++ b/src/lib/ostream.c	Sun Sep 16 12:22:27 2007 +0300
@@ -12,18 +12,18 @@
 
 void o_stream_ref(struct ostream *stream)
 {
-	_io_stream_ref(&stream->real_stream->iostream);
+	io_stream_ref(&stream->real_stream->iostream);
 }
 
 void o_stream_unref(struct ostream **stream)
 {
-	_io_stream_unref(&(*stream)->real_stream->iostream);
+	io_stream_unref(&(*stream)->real_stream->iostream);
 	*stream = NULL;
 }
 
 void o_stream_close(struct ostream *stream)
 {
-	_io_stream_close(&stream->real_stream->iostream);
+	io_stream_close(&stream->real_stream->iostream);
 	stream->closed = TRUE;
 }
 
@@ -32,7 +32,7 @@
 				 stream_flush_callback_t *callback,
 				 void *context)
 {
-	struct _ostream *_stream = stream->real_stream;
+	struct ostream_private *_stream = stream->real_stream;
 
 	_stream->callback = callback;
 	_stream->context = context;
@@ -40,7 +40,7 @@
 
 void o_stream_unset_flush_callback(struct ostream *stream)
 {
-	struct _ostream *_stream = stream->real_stream;
+	struct ostream_private *_stream = stream->real_stream;
 
 	_stream->callback = NULL;
 	_stream->context = NULL;
@@ -48,13 +48,12 @@
 
 void o_stream_set_max_buffer_size(struct ostream *stream, size_t max_size)
 {
-	_io_stream_set_max_buffer_size(&stream->real_stream->iostream,
-				       max_size);
+	io_stream_set_max_buffer_size(&stream->real_stream->iostream, max_size);
 }
 
 void o_stream_cork(struct ostream *stream)
 {
-	struct _ostream *_stream = stream->real_stream;
+	struct ostream_private *_stream = stream->real_stream;
 
 	if (stream->closed)
 		return;
@@ -64,7 +63,7 @@
 
 void o_stream_uncork(struct ostream *stream)
 {
-	struct _ostream *_stream = stream->real_stream;
+	struct ostream_private *_stream = stream->real_stream;
 
 	if (stream->closed)
 		return;
@@ -74,7 +73,7 @@
 
 int o_stream_flush(struct ostream *stream)
 {
-	struct _ostream *_stream = stream->real_stream;
+	struct ostream_private *_stream = stream->real_stream;
 
 	if (stream->closed)
 		return -1;
@@ -84,7 +83,7 @@
 
 void o_stream_set_flush_pending(struct ostream *stream, bool set)
 {
-	struct _ostream *_stream = stream->real_stream;
+	struct ostream_private *_stream = stream->real_stream;
 
 	if (!stream->closed)
 		_stream->flush_pending(_stream, set);
@@ -92,14 +91,14 @@
 
 size_t o_stream_get_buffer_used_size(struct ostream *stream)
 {
-	struct _ostream *_stream = stream->real_stream;
+	struct ostream_private *_stream = stream->real_stream;
 
 	return _stream->get_used_size(_stream);
 }
 
 int o_stream_seek(struct ostream *stream, uoff_t offset)
 {
-	struct _ostream *_stream = stream->real_stream;
+	struct ostream_private *_stream = stream->real_stream;
 
 	if (stream->closed)
 		return -1;
@@ -120,7 +119,7 @@
 ssize_t o_stream_sendv(struct ostream *stream, const struct const_iovec *iov,
 		       unsigned int iov_count)
 {
-	struct _ostream *_stream = stream->real_stream;
+	struct ostream_private *_stream = stream->real_stream;
 	unsigned int i;
 	size_t total_size;
 	ssize_t ret;
@@ -145,7 +144,7 @@
 off_t o_stream_send_istream(struct ostream *outstream,
 			    struct istream *instream)
 {
-	struct _ostream *_outstream = outstream->real_stream;
+	struct ostream_private *_outstream = outstream->real_stream;
 	off_t ret;
 
 	if (outstream->closed || instream->closed)
@@ -157,10 +156,10 @@
 	return ret;
 }
 
-struct ostream *_o_stream_create(struct _ostream *_stream)
+struct ostream *o_stream_create(struct ostream_private *_stream)
 {
 	_stream->ostream.real_stream = _stream;
 
-	_io_stream_init(&_stream->iostream);
+	io_stream_init(&_stream->iostream);
 	return &_stream->ostream;
 }
--- a/src/lib/ostream.h	Sun Sep 16 12:09:30 2007 +0300
+++ b/src/lib/ostream.h	Sun Sep 16 12:22:27 2007 +0300
@@ -13,7 +13,7 @@
 	unsigned int overflow:1;
 	unsigned int closed:1;
 
-	struct _ostream *real_stream;
+	struct ostream_private *real_stream;
 };
 
 /* Returns 1 if all data is sent (not necessarily flushed), 0 if not.
--- a/src/plugins/zlib/istream-zlib.c	Sun Sep 16 12:09:30 2007 +0300
+++ b/src/plugins/zlib/istream-zlib.c	Sun Sep 16 12:22:27 2007 +0300
@@ -11,7 +11,7 @@
 #define DEFAULT_MAX_BUFFER_SIZE (1024*1024)
 
 struct zlib_istream {
-	struct _istream istream;
+	struct istream_private istream;
 
 	int fd;
 	gzFile *file;
@@ -21,7 +21,7 @@
 	unsigned int marked:1;
 };
 
-static void _close(struct _iostream *stream)
+static void _close(struct iostream_private *stream)
 {
 	struct zlib_istream *zstream = (struct zlib_istream *)stream;
 
@@ -31,14 +31,14 @@
 	}
 }
 
-static void _destroy(struct _iostream *stream ATTR_UNUSED)
+static void _destroy(struct iostream_private *stream ATTR_UNUSED)
 {
-	struct _istream *_stream = (struct _istream *) stream;
+	struct istream_private *_stream = (struct istream_private *)stream;
 
 	i_free(_stream->w_buffer);
 }
 
-static ssize_t _read(struct _istream *stream)
+static ssize_t _read(struct istream_private *stream)
 {
 	struct zlib_istream *zstream = (struct zlib_istream *)stream;
 	size_t size;
@@ -53,19 +53,19 @@
 		if (!zstream->marked && stream->skip > 0) {
 			/* don't try to keep anything cached if we don't
 			   have a seek mark. */
-			_i_stream_compress(stream);
+			i_stream_compress(stream);
 		}
 
 		if (stream->max_buffer_size == 0 ||
 		    stream->buffer_size < stream->max_buffer_size) {
 			/* buffer is full - grow it */
-			_i_stream_grow_buffer(stream, I_STREAM_MIN_SIZE);
+			i_stream_grow_buffer(stream, I_STREAM_MIN_SIZE);
 		}
 
 		if (stream->pos == stream->buffer_size) {
 			if (stream->skip > 0) {
 				/* lose our buffer cache */
-				_i_stream_compress(stream);
+				i_stream_compress(stream);
 			}
 
 			if (stream->pos == stream->buffer_size)
@@ -107,7 +107,7 @@
 	return ret;
 }
 
-static void _seek(struct _istream *stream, uoff_t v_offset, bool mark)
+static void _seek(struct istream_private *stream, uoff_t v_offset, bool mark)
 {
 	struct zlib_istream *zstream = (struct zlib_istream *) stream;
 	uoff_t start_offset = stream->istream.v_offset - stream->skip;
@@ -154,12 +154,12 @@
 	}
 
 	if (mark) {
-		_i_stream_compress(stream);
+		i_stream_compress(stream);
 		zstream->marked = TRUE;
 	}
 }
 
-static const struct stat *_stat(struct _istream *stream, bool exact)
+static const struct stat *_stat(struct istream_private *stream, bool exact)
 {
 	struct zlib_istream *zstream = (struct zlib_istream *) stream;
 	size_t size;
@@ -186,7 +186,7 @@
 	return &stream->statbuf;
 }
 
-static void _sync(struct _istream *stream)
+static void _sync(struct istream_private *stream)
 {
 	struct zlib_istream *zstream = (struct zlib_istream *) stream;
 
@@ -218,5 +218,5 @@
 		zstream->istream.istream.seekable = TRUE;
 	}
 
-	return _i_stream_create(&zstream->istream, fd, 0);
+	return i_stream_create(&zstream->istream, fd, 0);
 }