Mercurial > dovecot > original-hg > dovecot-1.2

changeset 6420:a8b515e1a26f HEAD

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Removed _ prefixes from function names.
author Timo Sirainen <tss@iki.fi>
date Sun, 16 Sep 2007 13:25:23 +0300
parents 3a960ffa5de8
children 6fdc552c24de
files src/lib-index/mail-index-dummy-view.c src/lib-index/mail-index-transaction-view.c src/lib-index/mail-index-transaction.c src/lib-index/mail-index-view.c src/lib-mail/istream-header-filter.c src/lib-mail/message-part-serialize.c src/lib-sql/driver-mysql.c src/lib-sql/driver-pgsql.c src/lib-sql/driver-sqlite.c src/lib-storage/index/mbox/istream-raw-mbox.c src/lib/istream-data.c src/lib/istream-file.c 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/ostream-crlf.c src/lib/ostream-file.c src/lib/sha1.c src/lib/strfuncs.c src/plugins/zlib/istream-zlib.c
diffstat 22 files changed, 298 insertions(+), 271 deletions(-) [+]
line wrap: on
line diff
--- a/src/lib-index/mail-index-dummy-view.c	Sun Sep 16 12:51:41 2007 +0300
+++ b/src/lib-index/mail-index-dummy-view.c	Sun Sep 16 13:25:23 2007 +0300
@@ -5,7 +5,7 @@
 #include "mail-index-private.h"
 #include "mail-index-view-private.h"
 
-static void _dummy_view_close(struct mail_index_view *view ATTR_UNUSED)
+static void dummy_view_close(struct mail_index_view *view ATTR_UNUSED)
 {
 	i_assert(view->refcount == 0);
 
@@ -14,14 +14,14 @@
 }
 
 static uint32_t
-_dummy_view_get_message_count(struct mail_index_view *view ATTR_UNUSED)
+dummy_view_get_message_count(struct mail_index_view *view ATTR_UNUSED)
 {
 	return (uint32_t)-3;
 }
 
 static struct mail_index_view_vfuncs dummy_view_vfuncs = {
-	_dummy_view_close,
-	_dummy_view_get_message_count,
+	dummy_view_close,
+	dummy_view_get_message_count,
 	NULL,
 	NULL,
 	NULL,
--- a/src/lib-index/mail-index-transaction-view.c	Sun Sep 16 12:51:41 2007 +0300
+++ b/src/lib-index/mail-index-transaction-view.c	Sun Sep 16 13:25:23 2007 +0300
@@ -17,7 +17,7 @@
 	struct mail_index_header hdr;
 };
 
-static void _tview_close(struct mail_index_view *view)
+static void tview_close(struct mail_index_view *view)
 {
 	struct mail_index_view_transaction *tview =
 		(struct mail_index_view_transaction *)view;
@@ -30,7 +30,7 @@
 	mail_index_transaction_unref(&t);
 }
 
-static uint32_t _tview_get_message_count(struct mail_index_view *view)
+static uint32_t tview_get_message_count(struct mail_index_view *view)
 {
 	struct mail_index_view_transaction *tview =
                 (struct mail_index_view_transaction *)view;
@@ -41,7 +41,7 @@
 }
 
 static const struct mail_index_header *
-_tview_get_header(struct mail_index_view *view)
+tview_get_header(struct mail_index_view *view)
 {
 	struct mail_index_view_transaction *tview =
                 (struct mail_index_view_transaction *)view;
@@ -61,8 +61,8 @@
 }
 
 static const struct mail_index_record *
-_tview_lookup_full(struct mail_index_view *view, uint32_t seq,
-		   struct mail_index_map **map_r, bool *expunged_r)
+tview_lookup_full(struct mail_index_view *view, uint32_t seq,
+		  struct mail_index_map **map_r, bool *expunged_r)
 {
 	struct mail_index_view_transaction *tview =
                 (struct mail_index_view_transaction *)view;
@@ -85,8 +85,8 @@
 	return rec;
 }
 
-static void _tview_lookup_uid(struct mail_index_view *view, uint32_t seq,
-			      uint32_t *uid_r)
+static void
+tview_lookup_uid(struct mail_index_view *view, uint32_t seq, uint32_t *uid_r)
 {
 	struct mail_index_view_transaction *tview =
 		(struct mail_index_view_transaction *)view;
@@ -97,9 +97,9 @@
 		tview->super->lookup_uid(view, seq, uid_r);
 }
 
-static void _tview_lookup_uid_range(struct mail_index_view *view,
-				    uint32_t first_uid, uint32_t last_uid,
-				    uint32_t *first_seq_r, uint32_t *last_seq_r)
+static void tview_lookup_uid_range(struct mail_index_view *view,
+				   uint32_t first_uid, uint32_t last_uid,
+				   uint32_t *first_seq_r, uint32_t *last_seq_r)
 {
 	struct mail_index_view_transaction *tview =
 		(struct mail_index_view_transaction *)view;
@@ -138,9 +138,9 @@
 	i_assert(seq >= tview->t->first_new_seq);
 }
 
-static void _tview_lookup_first(struct mail_index_view *view,
-				enum mail_flags flags, uint8_t flags_mask,
-				uint32_t *seq_r)
+static void tview_lookup_first(struct mail_index_view *view,
+			       enum mail_flags flags, uint8_t flags_mask,
+			       uint32_t *seq_r)
 {
 	struct mail_index_view_transaction *tview =
 		(struct mail_index_view_transaction *)view;
@@ -176,9 +176,9 @@
 }
 
 static void
-_tview_lookup_ext_full(struct mail_index_view *view, uint32_t seq,
-		       uint32_t ext_id, struct mail_index_map **map_r,
-		       const void **data_r, bool *expunged_r)
+tview_lookup_ext_full(struct mail_index_view *view, uint32_t seq,
+		      uint32_t ext_id, struct mail_index_map **map_r,
+		      const void **data_r, bool *expunged_r)
 {
 	struct mail_index_view_transaction *tview =
 		(struct mail_index_view_transaction *)view;
@@ -214,9 +214,9 @@
 	}
 }
 
-static void _tview_get_header_ext(struct mail_index_view *view,
-				  struct mail_index_map *map, uint32_t ext_id,
-				  const void **data_r, size_t *data_size_r)
+static void tview_get_header_ext(struct mail_index_view *view,
+				 struct mail_index_map *map, uint32_t ext_id,
+				 const void **data_r, size_t *data_size_r)
 {
 	struct mail_index_view_transaction *tview =
 		(struct mail_index_view_transaction *)view;
@@ -225,9 +225,9 @@
 	tview->super->get_header_ext(view, map, ext_id, data_r, data_size_r);
 }
 
-static bool _tview_ext_get_reset_id(struct mail_index_view *view,
-				    struct mail_index_map *map,
-				    uint32_t ext_id, uint32_t *reset_id_r)
+static bool tview_ext_get_reset_id(struct mail_index_view *view,
+				   struct mail_index_map *map,
+				   uint32_t ext_id, uint32_t *reset_id_r)
 {
 	struct mail_index_view_transaction *tview =
 		(struct mail_index_view_transaction *)view;
@@ -245,16 +245,16 @@
 }
 
 static struct mail_index_view_vfuncs trans_view_vfuncs = {
-	_tview_close,
-        _tview_get_message_count,
-	_tview_get_header,
-	_tview_lookup_full,
-	_tview_lookup_uid,
-	_tview_lookup_uid_range,
-	_tview_lookup_first,
-	_tview_lookup_ext_full,
-	_tview_get_header_ext,
-	_tview_ext_get_reset_id
+	tview_close,
+        tview_get_message_count,
+	tview_get_header,
+	tview_lookup_full,
+	tview_lookup_uid,
+	tview_lookup_uid_range,
+	tview_lookup_first,
+	tview_lookup_ext_full,
+	tview_get_header_ext,
+	tview_ext_get_reset_id
 };
 
 struct mail_index_view *
--- a/src/lib-index/mail-index-transaction.c	Sun Sep 16 12:51:41 2007 +0300
+++ b/src/lib-index/mail-index-transaction.c	Sun Sep 16 13:25:23 2007 +0300
@@ -508,9 +508,9 @@
 	return next_uid;
 }
 
-static int _mail_index_transaction_commit(struct mail_index_transaction *t,
-					  uint32_t *log_file_seq_r,
-					  uoff_t *log_file_offset_r)
+static int mail_index_transaction_commit_v(struct mail_index_transaction *t,
+					   uint32_t *log_file_seq_r,
+					   uoff_t *log_file_offset_r)
 {
 	int ret;
 
@@ -538,7 +538,7 @@
 	return ret;
 }
 
-static void _mail_index_transaction_rollback(struct mail_index_transaction *t)
+static void mail_index_transaction_rollback_v(struct mail_index_transaction *t)
 {
 	if (t->cache_trans_ctx != NULL) {
 		mail_cache_transaction_rollback(t->cache_trans_ctx);
@@ -1284,8 +1284,8 @@
 }
 
 struct mail_index_transaction_vfuncs trans_vfuncs = {
-	_mail_index_transaction_commit,
-	_mail_index_transaction_rollback
+	mail_index_transaction_commit_v,
+	mail_index_transaction_rollback_v
 };
 
 struct mail_index_transaction *
--- a/src/lib-index/mail-index-view.c	Sun Sep 16 12:51:41 2007 +0300
+++ b/src/lib-index/mail-index-view.c	Sun Sep 16 13:25:23 2007 +0300
@@ -38,7 +38,7 @@
 	view->refcount++;
 }
 
-static void _view_close(struct mail_index_view *view)
+static void view_close(struct mail_index_view *view)
 {
 	i_assert(view->refcount == 0);
 
@@ -119,20 +119,20 @@
 	array_clear(&view->map_refs);
 }
 
-static uint32_t _view_get_messages_count(struct mail_index_view *view)
+static uint32_t view_get_messages_count(struct mail_index_view *view)
 {
 	return view->map->hdr.messages_count;
 }
 
 static const struct mail_index_header *
-_view_get_header(struct mail_index_view *view)
+view_get_header(struct mail_index_view *view)
 {
 	return &view->map->hdr;
 }
 
 static const struct mail_index_record *
-_view_lookup_full(struct mail_index_view *view, uint32_t seq,
-		  struct mail_index_map **map_r, bool *expunged_r)
+view_lookup_full(struct mail_index_view *view, uint32_t seq,
+		 struct mail_index_map **map_r, bool *expunged_r)
 {
 	static struct mail_index_record broken_rec;
 	struct mail_index_map *map;
@@ -204,8 +204,8 @@
 	}
 }
 
-static void _view_lookup_uid(struct mail_index_view *view, uint32_t seq,
-			     uint32_t *uid_r)
+static void view_lookup_uid(struct mail_index_view *view, uint32_t seq,
+			    uint32_t *uid_r)
 {
 	i_assert(seq > 0 && seq <= mail_index_view_get_messages_count(view));
 
@@ -261,9 +261,9 @@
 	return idx+1;
 }
 
-static void _view_lookup_uid_range(struct mail_index_view *view,
-				   uint32_t first_uid, uint32_t last_uid,
-				   uint32_t *first_seq_r, uint32_t *last_seq_r)
+static void view_lookup_uid_range(struct mail_index_view *view,
+				  uint32_t first_uid, uint32_t last_uid,
+				  uint32_t *first_seq_r, uint32_t *last_seq_r)
 {
 	i_assert(first_uid > 0);
 	i_assert(first_uid <= last_uid);
@@ -302,9 +302,9 @@
 	i_assert(*last_seq_r >= *first_seq_r);
 }
 
-static void _view_lookup_first(struct mail_index_view *view,
-			       enum mail_flags flags, uint8_t flags_mask,
-			       uint32_t *seq_r)
+static void view_lookup_first(struct mail_index_view *view,
+			      enum mail_flags flags, uint8_t flags_mask,
+			      uint32_t *seq_r)
 {
 #define LOW_UPDATE(x) \
 	STMT_START { if ((x) > low_uid) low_uid = x; } STMT_END
@@ -339,9 +339,9 @@
 }
 
 static void
-_view_lookup_ext_full(struct mail_index_view *view, uint32_t seq,
-		      uint32_t ext_id, struct mail_index_map **map_r,
-		      const void **data_r, bool *expunged_r)
+view_lookup_ext_full(struct mail_index_view *view, uint32_t seq,
+		     uint32_t ext_id, struct mail_index_map **map_r,
+		     const void **data_r, bool *expunged_r)
 {
 	const struct mail_index_ext *ext;
 	const struct mail_index_record *rec;
@@ -359,9 +359,9 @@
 	*data_r = offset == 0 ? NULL : CONST_PTR_OFFSET(rec, offset);
 }
 
-static void _view_get_header_ext(struct mail_index_view *view,
-				 struct mail_index_map *map, uint32_t ext_id,
-				 const void **data_r, size_t *data_size_r)
+static void view_get_header_ext(struct mail_index_view *view,
+				struct mail_index_map *map, uint32_t ext_id,
+				const void **data_r, size_t *data_size_r)
 {
 	const struct mail_index_ext *ext;
 	uint32_t idx;
@@ -383,9 +383,9 @@
 	*data_size_r = ext->hdr_size;
 }
 
-static bool _view_ext_get_reset_id(struct mail_index_view *view ATTR_UNUSED,
-				   struct mail_index_map *map,
-				   uint32_t ext_id, uint32_t *reset_id_r)
+static bool view_ext_get_reset_id(struct mail_index_view *view ATTR_UNUSED,
+				  struct mail_index_map *map,
+				  uint32_t ext_id, uint32_t *reset_id_r)
 {
 	const struct mail_index_ext *ext;
 	uint32_t idx;
@@ -593,16 +593,16 @@
 }
 
 static struct mail_index_view_vfuncs view_vfuncs = {
-	_view_close,
-	_view_get_messages_count,
-	_view_get_header,
-	_view_lookup_full,
-	_view_lookup_uid,
-	_view_lookup_uid_range,
-	_view_lookup_first,
-	_view_lookup_ext_full,
-	_view_get_header_ext,
-	_view_ext_get_reset_id
+	view_close,
+	view_get_messages_count,
+	view_get_header,
+	view_lookup_full,
+	view_lookup_uid,
+	view_lookup_uid_range,
+	view_lookup_first,
+	view_lookup_ext_full,
+	view_get_header_ext,
+	view_ext_get_reset_id
 };
 
 struct mail_index_view *
--- a/src/lib-mail/istream-header-filter.c	Sun Sep 16 12:51:41 2007 +0300
+++ b/src/lib-mail/istream-header-filter.c	Sun Sep 16 13:25:23 2007 +0300
@@ -37,7 +37,7 @@
 
 header_filter_callback *null_header_filter_callback = NULL;
 
-static void _destroy(struct iostream_private *stream)
+static void i_stream_header_filter_destroy(struct iostream_private *stream)
 {
 	struct header_filter_istream *mstream =
 		(struct header_filter_istream *)stream;
@@ -49,7 +49,8 @@
 }
 
 static void
-_set_max_buffer_size(struct iostream_private *stream, size_t max_size)
+i_stream_header_filter_set_max_buffer_size(struct iostream_private *stream,
+					   size_t max_size)
 {
 	struct header_filter_istream *mstream =
 		(struct header_filter_istream *)stream;
@@ -201,7 +202,7 @@
 	return ret;
 }
 
-static ssize_t _read(struct istream_private *stream)
+static ssize_t i_stream_header_filter_read(struct istream_private *stream)
 {
 	struct header_filter_istream *mstream =
 		(struct header_filter_istream *)stream;
@@ -252,7 +253,7 @@
 	size_t pos;
 
 	while (!mstream->header_read) {
-		if (_read(&mstream->istream) == -1)
+		if (i_stream_header_filter_read(&mstream->istream) == -1)
 			break;
 
 		(void)i_stream_get_data(&mstream->istream.istream, &pos);
@@ -260,8 +261,8 @@
 	}
 }
 
-static void _seek(struct istream_private *stream, uoff_t v_offset,
-		  bool mark ATTR_UNUSED)
+static void i_stream_header_filter_seek(struct istream_private *stream,
+					uoff_t v_offset, bool mark ATTR_UNUSED)
 {
 	struct header_filter_istream *mstream =
 		(struct header_filter_istream *)stream;
@@ -292,13 +293,13 @@
 }
 
 static void ATTR_NORETURN
-_sync(struct istream_private *stream ATTR_UNUSED)
+i_stream_header_filter_sync(struct istream_private *stream ATTR_UNUSED)
 {
 	i_panic("istream-header-filter sync() not implemented");
 }
 
 static const struct stat *
-_stat(struct istream_private *stream, bool exact)
+i_stream_header_filter_stat(struct istream_private *stream, bool exact)
 {
 	struct header_filter_istream *mstream =
 		(struct header_filter_istream *)stream;
@@ -350,13 +351,14 @@
 	mstream->hide_body = (flags & HEADER_FILTER_HIDE_BODY) != 0;
 	mstream->start_offset = input->v_offset;
 
-	mstream->istream.iostream.destroy = _destroy;
-	mstream->istream.iostream.set_max_buffer_size = _set_max_buffer_size;
+	mstream->istream.iostream.destroy = i_stream_header_filter_destroy;
+	mstream->istream.iostream.set_max_buffer_size =
+		i_stream_header_filter_set_max_buffer_size;
 
-	mstream->istream.read = _read;
-	mstream->istream.seek = _seek;
-	mstream->istream.sync = _sync;
-	mstream->istream.stat = _stat;
+	mstream->istream.read = i_stream_header_filter_read;
+	mstream->istream.seek = i_stream_header_filter_seek;
+	mstream->istream.sync = i_stream_header_filter_sync;
+	mstream->istream.stat = i_stream_header_filter_stat;
 
 	mstream->istream.istream.blocking = input->blocking;
 	mstream->istream.istream.seekable = input->seekable;
--- a/src/lib-mail/message-part-serialize.c	Sun Sep 16 12:51:41 2007 +0300
+++ b/src/lib-mail/message-part-serialize.c	Sun Sep 16 13:25:23 2007 +0300
@@ -40,7 +40,7 @@
 };
 
 static unsigned int
-_message_part_serialize(struct message_part *part, buffer_t *dest)
+part_serialize(struct message_part *part, buffer_t *dest)
 {
 	unsigned int count, children_count;
 	size_t children_offset;
@@ -80,8 +80,7 @@
 
 			if (part->children != NULL) {
 				children_count =
-					_message_part_serialize(part->children,
-								dest);
+					part_serialize(part->children, dest);
 
 				buffer_write(dest, children_offset,
 					     &children_count,
@@ -100,7 +99,7 @@
 
 void message_part_serialize(struct message_part *part, buffer_t *dest)
 {
-	_message_part_serialize(part, dest);
+	part_serialize(part, dest);
 }
 
 static bool read_next(struct deserialize_context *ctx,
--- a/src/lib-sql/driver-mysql.c	Sun Sep 16 12:51:41 2007 +0300
+++ b/src/lib-sql/driver-mysql.c	Sun Sep 16 13:25:23 2007 +0300
@@ -242,7 +242,7 @@
 		i_fatal("mysql: No hosts given in connect string");
 }
 
-static struct sql_db *_driver_mysql_init(const char *connect_string)
+static struct sql_db *driver_mysql_init_v(const char *connect_string)
 {
 	struct mysql_db *db;
 	pool_t pool;
@@ -258,7 +258,7 @@
 	return &db->api;
 }
 
-static void _driver_mysql_deinit(struct sql_db *_db)
+static void driver_mysql_deinit_v(struct sql_db *_db)
 {
 	struct mysql_db *db = (struct mysql_db *)_db;
 	struct mysql_connection *conn;
@@ -657,8 +657,8 @@
 struct sql_db driver_mysql_db = {
 	"mysql",
 
-	_driver_mysql_init,
-	_driver_mysql_deinit,
+	driver_mysql_init_v,
+	driver_mysql_deinit_v,
 	driver_mysql_get_flags,
         driver_mysql_connect_all,
         driver_mysql_escape_string,
--- a/src/lib-sql/driver-pgsql.c	Sun Sep 16 12:51:41 2007 +0300
+++ b/src/lib-sql/driver-pgsql.c	Sun Sep 16 13:25:23 2007 +0300
@@ -181,7 +181,7 @@
 	}
 }
 
-static struct sql_db *_driver_pgsql_init(const char *connect_string)
+static struct sql_db *driver_pgsql_init_v(const char *connect_string)
 {
 	struct pgsql_db *db;
 
@@ -194,7 +194,7 @@
 	return &db->api;
 }
 
-static void _driver_pgsql_deinit(struct sql_db *_db)
+static void driver_pgsql_deinit_v(struct sql_db *_db)
 {
 	struct pgsql_db *db = (struct pgsql_db *)_db;
 
@@ -864,8 +864,8 @@
 struct sql_db driver_pgsql_db = {
 	"pgsql",
 
-	_driver_pgsql_init,
-	_driver_pgsql_deinit,
+	driver_pgsql_init_v,
+	driver_pgsql_deinit_v,
         driver_pgsql_get_flags,
 	driver_pgsql_connect,
 	driver_pgsql_escape_string,
--- a/src/lib-sql/driver-sqlite.c	Sun Sep 16 12:51:41 2007 +0300
+++ b/src/lib-sql/driver-sqlite.c	Sun Sep 16 13:25:23 2007 +0300
@@ -57,7 +57,7 @@
 	}
 }
 
-static struct sql_db *_driver_sqlite_init(const char *connect_string)
+static struct sql_db *driver_sqlite_init_v(const char *connect_string)
 {
 	struct sqlite_db *db;
 	pool_t pool;
@@ -74,7 +74,7 @@
 	return &db->api;
 }
 
-static void _driver_sqlite_deinit(struct sql_db *_db)
+static void driver_sqlite_deinit_v(struct sql_db *_db)
 {
 	struct sqlite_db *db = (struct sqlite_db *)_db;
 
@@ -374,8 +374,8 @@
 struct sql_db driver_sqlite_db = {
 	"sqlite",
 
-	_driver_sqlite_init,
-	_driver_sqlite_deinit,
+	driver_sqlite_init_v,
+	driver_sqlite_deinit_v,
 	driver_sqlite_get_flags,
 	driver_sqlite_connect,
 	driver_sqlite_escape_string,
--- a/src/lib-storage/index/mbox/istream-raw-mbox.c	Sun Sep 16 12:51:41 2007 +0300
+++ b/src/lib-storage/index/mbox/istream-raw-mbox.c	Sun Sep 16 13:25:23 2007 +0300
@@ -22,7 +22,7 @@
 	unsigned int eof:1;
 };
 
-static void _destroy(struct iostream_private *stream)
+static void i_stream_raw_mbox_destroy(struct iostream_private *stream)
 {
 	struct raw_mbox_istream *rstream = (struct raw_mbox_istream *)stream;
 
@@ -34,7 +34,8 @@
 }
 
 static void
-_set_max_buffer_size(struct iostream_private *stream, size_t max_size)
+i_stream_raw_mbox_set_max_buffer_size(struct iostream_private *stream,
+				      size_t max_size)
 {
 	struct raw_mbox_istream *rstream = (struct raw_mbox_istream *)stream;
 
@@ -118,7 +119,7 @@
 	}
 }
 
-static ssize_t _read(struct istream_private *stream)
+static ssize_t i_stream_raw_mbox_read(struct istream_private *stream)
 {
 	static const char *mbox_from = "\nFrom ";
 	struct raw_mbox_istream *rstream = (struct raw_mbox_istream *)stream;
@@ -150,7 +151,7 @@
 			/* fake our read count. needed because if in the end
 			   we have only one character in buffer and we skip it
 			   (as potential CR), we want to get back to this
-			   _read() to read more data. */
+			   i_stream_raw_mbox_read() to read more data. */
 			ret = pos;
 			break;
 		}
@@ -191,7 +192,7 @@
 			stream->istream.eof = TRUE;
 			rstream->crlf_ending = crlf_ending;
 			handle_end_of_mail(rstream, pos);
-			return ret < 0 ? _read(stream) : ret;
+			return ret < 0 ? i_stream_raw_mbox_read(stream) : ret;
 		}
 	}
 
@@ -202,7 +203,7 @@
 			   need more data to verify it. */
 			rstream->input_peak_offset =
 				stream->istream.v_offset + pos;
-			return _read(stream);
+			return i_stream_raw_mbox_read(stream);
 		}
 		if (mbox_read_from_line(rstream) < 0) {
 			stream->pos = 0;
@@ -215,7 +216,7 @@
 		   so start again from headers */
 		buf = i_stream_get_data(rstream->input, &pos);
 		if (pos == 0)
-			return _read(stream);
+			return i_stream_raw_mbox_read(stream);
 	}
 
 	/* See if we have From-line here - note that it works right only
@@ -292,7 +293,7 @@
 	stream->buffer = buf;
 	if (new_pos == stream->pos) {
 		if (stream->istream.eof || ret > 0)
-			return _read(stream);
+			return i_stream_raw_mbox_read(stream);
 		i_assert(new_pos > 0);
 		ret = -2;
 	} else {
@@ -303,8 +304,8 @@
 	return ret;
 }
 
-static void _seek(struct istream_private *stream, uoff_t v_offset,
-		  bool mark ATTR_UNUSED)
+static void i_stream_raw_mbox_seek(struct istream_private *stream,
+				   uoff_t v_offset, bool mark ATTR_UNUSED)
 {
 	struct raw_mbox_istream *rstream = (struct raw_mbox_istream *)stream;
 
@@ -316,7 +317,7 @@
 	rstream->eof = FALSE;
 }
 
-static void _sync(struct istream_private *stream)
+static void i_stream_raw_mbox_sync(struct istream_private *stream)
 {
 	struct raw_mbox_istream *rstream = (struct raw_mbox_istream *)stream;
 
@@ -326,7 +327,8 @@
 	rstream->istream.pos = 0;
 }
 
-static const struct stat *_stat(struct istream_private *stream, bool exact)
+static const struct stat *
+i_stream_raw_mbox_stat(struct istream_private *stream, bool exact)
 {
 	struct raw_mbox_istream *rstream = (struct raw_mbox_istream *)stream;
 	const struct stat *st;
@@ -356,13 +358,14 @@
 	rstream->received_time = (time_t)-1;
 	rstream->next_received_time = (time_t)-1;
 
-	rstream->istream.iostream.destroy = _destroy;
-	rstream->istream.iostream.set_max_buffer_size = _set_max_buffer_size;
+	rstream->istream.iostream.destroy = i_stream_raw_mbox_destroy;
+	rstream->istream.iostream.set_max_buffer_size =
+		i_stream_raw_mbox_set_max_buffer_size;
 
-	rstream->istream.read = _read;
-	rstream->istream.seek = _seek;
-	rstream->istream.sync = _sync;
-	rstream->istream.stat = _stat;
+	rstream->istream.read = i_stream_raw_mbox_read;
+	rstream->istream.seek = i_stream_raw_mbox_seek;
+	rstream->istream.sync = i_stream_raw_mbox_sync;
+	rstream->istream.stat = i_stream_raw_mbox_stat;
 
 	rstream->istream.istream.blocking = input->blocking;
 	rstream->istream.istream.seekable = input->seekable;
@@ -425,7 +428,7 @@
 		(struct raw_mbox_istream *)stream->real_stream;
 
 	if (rstream->hdr_offset == rstream->from_offset)
-		(void)_read(&rstream->istream);
+		(void)i_stream_raw_mbox_read(&rstream->istream);
 
 	if (rstream->corrupted) {
 		i_error("Unexpectedly lost From-line at "
@@ -452,7 +455,7 @@
 		i_stream_get_data(stream, &pos);
 		i_stream_skip(stream, pos);
 
-		if (_read(&rstream->istream) < 0) {
+		if (i_stream_raw_mbox_read(&rstream->istream) < 0) {
 			if (rstream->corrupted) {
 				i_error("Unexpectedly lost From-line at "
 					"%"PRIuUOFF_T, rstream->from_offset);
@@ -506,7 +509,7 @@
 		(struct raw_mbox_istream *)stream->real_stream;
 
 	if (rstream->received_time == (time_t)-1)
-		(void)_read(&rstream->istream);
+		(void)i_stream_raw_mbox_read(&rstream->istream);
 	return rstream->received_time;
 }
 
@@ -516,7 +519,7 @@
 		(struct raw_mbox_istream *)stream->real_stream;
 
 	if (rstream->sender == NULL)
-		(void)_read(&rstream->istream);
+		(void)i_stream_raw_mbox_read(&rstream->istream);
 	return rstream->sender == NULL ? "" : rstream->sender;
 }
 
@@ -595,7 +598,7 @@
 	i_stream_seek_mark(rstream->input, offset);
 
 	if (check)
-		(void)_read(&rstream->istream);
+		(void)i_stream_raw_mbox_read(&rstream->istream);
 	return rstream->corrupted ? -1 : 0;
 }
 
--- a/src/lib/istream-data.c	Sun Sep 16 12:51:41 2007 +0300
+++ b/src/lib/istream-data.c	Sun Sep 16 13:25:23 2007 +0300
@@ -3,14 +3,14 @@
 #include "lib.h"
 #include "istream-internal.h"
 
-static ssize_t _read(struct istream_private *stream ATTR_UNUSED)
+static ssize_t i_stream_data_read(struct istream_private *stream)
 {
 	stream->istream.eof = TRUE;
 	return -1;
 }
 
-static void _seek(struct istream_private *stream, uoff_t v_offset,
-		  bool mark ATTR_UNUSED)
+static void i_stream_data_seek(struct istream_private *stream, uoff_t v_offset,
+			       bool mark ATTR_UNUSED)
 {
 	stream->skip = v_offset;
 	stream->istream.v_offset = v_offset;
@@ -24,8 +24,8 @@
 	stream->buffer = data;
 	stream->pos = size;
 
-	stream->read = _read;
-	stream->seek = _seek;
+	stream->read = i_stream_data_read;
+	stream->seek = i_stream_data_seek;
 
 	stream->istream.blocking = TRUE;
 	stream->istream.seekable = TRUE;
--- a/src/lib/istream-file.c	Sun Sep 16 12:51:41 2007 +0300
+++ b/src/lib/istream-file.c	Sun Sep 16 13:25:23 2007 +0300
@@ -20,7 +20,7 @@
 	unsigned int autoclose_fd:1;
 };
 
-static void _close(struct iostream_private *stream)
+static void i_stream_file_close(struct iostream_private *stream)
 {
 	struct file_istream *fstream = (struct file_istream *)stream;
 	struct istream_private *_stream = (struct istream_private *)stream;
@@ -32,14 +32,14 @@
 	_stream->fd = -1;
 }
 
-static void _destroy(struct iostream_private *stream)
+static void i_stream_file_destroy(struct iostream_private *stream)
 {
 	struct istream_private *_stream = (struct istream_private *)stream;
 
 	i_free(_stream->w_buffer);
 }
 
-static ssize_t _read(struct istream_private *stream)
+static ssize_t i_stream_file_read(struct istream_private *stream)
 {
 	struct file_istream *fstream = (struct file_istream *) stream;
 	size_t size;
@@ -116,8 +116,8 @@
 	return ret;
 }
 
-static void _seek(struct istream_private *stream, uoff_t v_offset,
-		  bool mark ATTR_UNUSED)
+static void i_stream_file_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_private *stream)
+static void i_stream_file_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_private *stream, bool exact ATTR_UNUSED)
+i_stream_file_stat(struct istream_private *stream, bool exact ATTR_UNUSED)
 {
 	struct file_istream *fstream = (struct file_istream *) stream;
 
@@ -168,14 +168,14 @@
 	fstream = i_new(struct file_istream, 1);
 	fstream->autoclose_fd = autoclose_fd;
 
-	fstream->istream.iostream.close = _close;
-	fstream->istream.iostream.destroy = _destroy;
+	fstream->istream.iostream.close = i_stream_file_close;
+	fstream->istream.iostream.destroy = i_stream_file_destroy;
 
 	fstream->istream.max_buffer_size = max_buffer_size;
-	fstream->istream.read = _read;
-	fstream->istream.seek = _seek;
-	fstream->istream.sync = _sync;
-	fstream->istream.stat = _stat;
+	fstream->istream.read = i_stream_file_read;
+	fstream->istream.seek = i_stream_file_seek;
+	fstream->istream.sync = i_stream_file_sync;
+	fstream->istream.stat = i_stream_file_stat;
 
 	/* if it's a file, set the flags properly */
 	if (fstat(fd, &st) == 0 && S_ISREG(st.st_mode)) {
--- a/src/lib/istream-limit.c	Sun Sep 16 12:51:41 2007 +0300
+++ b/src/lib/istream-limit.c	Sun Sep 16 13:25:23 2007 +0300
@@ -10,7 +10,7 @@
 	uoff_t v_start_offset, v_size;
 };
 
-static void _destroy(struct iostream_private *stream)
+static void i_stream_limit_destroy(struct iostream_private *stream)
 {
 	struct limit_istream *lstream = (struct limit_istream *) stream;
 
@@ -21,14 +21,15 @@
 }
 
 static void
-_set_max_buffer_size(struct iostream_private *stream, size_t max_size)
+i_stream_limit_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_private *stream)
+static ssize_t i_stream_limit_read(struct istream_private *stream)
 {
 	struct limit_istream *lstream = (struct limit_istream *) stream;
 	uoff_t left;
@@ -78,8 +79,8 @@
 	return ret;
 }
 
-static void _seek(struct istream_private *stream, uoff_t v_offset,
-		  bool mark ATTR_UNUSED)
+static void i_stream_limit_seek(struct istream_private *stream, uoff_t v_offset,
+				bool mark ATTR_UNUSED)
 {
 	struct limit_istream *lstream = (struct limit_istream *) stream;
 
@@ -90,7 +91,8 @@
 	stream->skip = stream->pos = 0;
 }
 
-static const struct stat *_stat(struct istream_private *stream, bool exact)
+static const struct stat *
+i_stream_limit_stat(struct istream_private *stream, bool exact)
 {
 	struct limit_istream *lstream = (struct limit_istream *) stream;
 	const struct stat *st;
@@ -122,12 +124,13 @@
 		input->v_offset - v_start_offset > v_size ? v_size :
 		input->v_offset - v_start_offset;
 
-	lstream->istream.iostream.destroy = _destroy;
-	lstream->istream.iostream.set_max_buffer_size = _set_max_buffer_size;
+	lstream->istream.iostream.destroy = i_stream_limit_destroy;
+	lstream->istream.iostream.set_max_buffer_size =
+		i_stream_limit_set_max_buffer_size;
 
-	lstream->istream.read = _read;
-	lstream->istream.seek = _seek;
-	lstream->istream.stat = _stat;
+	lstream->istream.read = i_stream_limit_read;
+	lstream->istream.seek = i_stream_limit_seek;
+	lstream->istream.stat = i_stream_limit_stat;
 
 	lstream->istream.istream.blocking = input->blocking;
 	lstream->istream.istream.seekable = input->seekable;
--- a/src/lib/istream-mmap.c	Sun Sep 16 12:51:41 2007 +0300
+++ b/src/lib/istream-mmap.c	Sun Sep 16 13:25:23 2007 +0300
@@ -22,7 +22,7 @@
 
 static size_t mmap_pagemask = 0;
 
-static void _close(struct iostream_private *stream)
+static void i_stream_mmap_close(struct iostream_private *stream)
 {
 	struct mmap_istream *mstream = (struct mmap_istream *) stream;
 
@@ -47,7 +47,7 @@
 	}
 }
 
-static void _destroy(struct iostream_private *stream)
+static void i_stream_mmap_destroy(struct iostream_private *stream)
 {
 	struct mmap_istream *mstream = (struct mmap_istream *) stream;
 
@@ -60,7 +60,7 @@
 		(mmap_get_page_size() - 1);
 }
 
-static ssize_t _read(struct istream_private *stream)
+static ssize_t i_stream_mmap_read(struct istream_private *stream)
 {
 	struct mmap_istream *mstream = (struct mmap_istream *) stream;
 	size_t aligned_skip;
@@ -130,8 +130,8 @@
 	return stream->pos - stream->skip;
 }
 
-static void _seek(struct istream_private *stream, uoff_t v_offset,
-		  bool mark ATTR_UNUSED)
+static void i_stream_mmap_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_private *stream)
+static void i_stream_mmap_sync(struct istream_private *stream)
 {
 	struct mmap_istream *mstream = (struct mmap_istream *) stream;
 
@@ -175,7 +175,7 @@
 }
 
 static const struct stat *
-_stat(struct istream_private *stream, bool exact ATTR_UNUSED)
+i_stream_mmap_stat(struct istream_private *stream, bool exact ATTR_UNUSED)
 {
 	struct mmap_istream *mstream = (struct mmap_istream *) stream;
 
@@ -211,14 +211,14 @@
 	mstream->autoclose_fd = autoclose_fd;
 	mstream->v_size = v_size;
 
-	mstream->istream.iostream.close = _close;
-	mstream->istream.iostream.destroy = _destroy;
+	mstream->istream.iostream.close = i_stream_mmap_close;
+	mstream->istream.iostream.destroy = i_stream_mmap_destroy;
 
 	mstream->istream.max_buffer_size = block_size;
-	mstream->istream.read = _read;
-	mstream->istream.seek = _seek;
-	mstream->istream.sync = _sync;
-	mstream->istream.stat = _stat;
+	mstream->istream.read = i_stream_mmap_read;
+	mstream->istream.seek = i_stream_mmap_seek;
+	mstream->istream.sync = i_stream_mmap_sync;
+	mstream->istream.stat = i_stream_mmap_stat;
 
 	istream = i_stream_create(&mstream->istream, fd, start_offset);
 	istream->mmaped = TRUE;
--- a/src/lib/istream-seekable.c	Sun Sep 16 12:51:41 2007 +0300
+++ b/src/lib/istream-seekable.c	Sun Sep 16 13:25:23 2007 +0300
@@ -29,7 +29,7 @@
 	int fd;
 };
 
-static void _close(struct iostream_private *stream ATTR_UNUSED)
+static void i_stream_seekable_close(struct iostream_private *stream)
 {
 	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_private *stream)
+static void i_stream_seekable_destroy(struct iostream_private *stream)
 {
 	struct seekable_istream *sstream = (struct seekable_istream *)stream;
 	unsigned int i;
@@ -57,7 +57,8 @@
 }
 
 static void
-_set_max_buffer_size(struct iostream_private *stream, size_t max_size)
+i_stream_seekable_set_max_buffer_size(struct iostream_private *stream,
+				      size_t max_size)
 {
 	struct seekable_istream *sstream = (struct seekable_istream *)stream;
 	unsigned int i;
@@ -192,7 +193,7 @@
 	return TRUE;
 }
 
-static ssize_t _read(struct istream_private *stream)
+static ssize_t i_stream_seekable_read(struct istream_private *stream)
 {
 	struct seekable_istream *sstream = (struct seekable_istream *)stream;
 	const unsigned char *data;
@@ -251,15 +252,16 @@
 	return ret;
 }
 
-static void _seek(struct istream_private *stream, uoff_t v_offset,
-		  bool mark ATTR_UNUSED)
+static void i_stream_seekable_seek(struct istream_private *stream,
+				   uoff_t v_offset, bool mark ATTR_UNUSED)
 {
 	stream->istream.stream_errno = 0;
 	stream->istream.v_offset = v_offset;
 	stream->skip = stream->pos = 0;
 }
 
-static const struct stat *_stat(struct istream_private *stream, bool exact)
+static const struct stat *
+i_stream_seekable_stat(struct istream_private *stream, bool exact)
 {
 	struct seekable_istream *sstream = (struct seekable_istream *)stream;
 	uoff_t old_offset;
@@ -271,7 +273,7 @@
 		old_offset = stream->istream.v_offset;
 		do {
 			i_stream_skip(&stream->istream, stream->skip);
-		} while ((ret = _read(stream)) > 0);
+		} while ((ret = i_stream_seekable_read(stream)) > 0);
 
 		if (ret == 0) {
 			i_panic("i_stream_stat() used for non-blocking "
@@ -319,13 +321,14 @@
 	buffer_append(sstream->buffer, data, size);
 	i_stream_skip(sstream->cur_input, size);
 
-	sstream->istream.iostream.close = _close;
-	sstream->istream.iostream.destroy = _destroy;
-	sstream->istream.iostream.set_max_buffer_size = _set_max_buffer_size;
+	sstream->istream.iostream.close = i_stream_seekable_close;
+	sstream->istream.iostream.destroy = i_stream_seekable_destroy;
+	sstream->istream.iostream.set_max_buffer_size =
+		i_stream_seekable_set_max_buffer_size;
 
-	sstream->istream.read = _read;
-	sstream->istream.seek = _seek;
-	sstream->istream.stat = _stat;
+	sstream->istream.read = i_stream_seekable_read;
+	sstream->istream.seek = i_stream_seekable_seek;
+	sstream->istream.stat = i_stream_seekable_stat;
 
 	return i_stream_create(&sstream->istream, -1, 0);
 }
--- a/src/lib/istream-tee.c	Sun Sep 16 12:51:41 2007 +0300
+++ b/src/lib/istream-tee.c	Sun Sep 16 13:25:23 2007 +0300
@@ -58,14 +58,14 @@
 	}
 }
 
-static void _close(struct iostream_private *stream)
+static void i_stream_tee_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_private *stream)
+static void i_stream_tee_destroy(struct iostream_private *stream)
 {
 	struct tee_child_istream *tstream = (struct tee_child_istream *)stream;
 	struct tee_istream *tee = tstream->tee;
@@ -94,14 +94,15 @@
 }
 
 static void
-_set_max_buffer_size(struct iostream_private *stream, size_t max_size)
+i_stream_tee_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_private *stream)
+static ssize_t i_stream_tee_read(struct istream_private *stream)
 {
 	struct tee_child_istream *tstream = (struct tee_child_istream *)stream;
 	struct istream *input = tstream->tee->input;
@@ -143,20 +144,21 @@
 }
 
 static void ATTR_NORETURN
-_seek(struct istream_private *stream ATTR_UNUSED,
-      uoff_t v_offset ATTR_UNUSED, bool mark ATTR_UNUSED)
+i_stream_tee_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_private *stream, bool exact)
+static const struct stat *
+i_stream_tee_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_private *stream)
+static void i_stream_tee_sync(struct istream_private *stream)
 {
 	struct tee_child_istream *tstream = (struct tee_child_istream *)stream;
 	size_t size;
@@ -188,14 +190,15 @@
 	tstream = i_new(struct tee_child_istream, 1);
 	tstream->tee = tee;
 
-	tstream->istream.iostream.close = _close;
-	tstream->istream.iostream.destroy = _destroy;
-	tstream->istream.iostream.set_max_buffer_size = _set_max_buffer_size;
+	tstream->istream.iostream.close = i_stream_tee_close;
+	tstream->istream.iostream.destroy = i_stream_tee_destroy;
+	tstream->istream.iostream.set_max_buffer_size =
+		i_stream_tee_set_max_buffer_size;
 
-	tstream->istream.read = _read;
-	tstream->istream.seek = _seek;
-	tstream->istream.stat = _stat;
-	tstream->istream.sync = _sync;
+	tstream->istream.read = i_stream_tee_read;
+	tstream->istream.seek = i_stream_tee_seek;
+	tstream->istream.stat = i_stream_tee_stat;
+	tstream->istream.sync = i_stream_tee_sync;
 
 	tstream->next = tee->children;
 	tee->children = tstream;
--- a/src/lib/istream.c	Sun Sep 16 12:51:41 2007 +0300
+++ b/src/lib/istream.c	Sun Sep 16 13:25:23 2007 +0300
@@ -290,7 +290,8 @@
 }
 
 static void
-_set_max_buffer_size(struct iostream_private *stream, size_t max_size)
+i_stream_default_set_max_buffer_size(struct iostream_private *stream,
+				     size_t max_size)
 {
 	struct istream_private *_stream = (struct istream_private *)stream;
 
@@ -298,7 +299,7 @@
 }
 
 static const struct stat *
-_stat(struct istream_private *stream, bool exact ATTR_UNUSED)
+i_stream_default_stat(struct istream_private *stream, bool exact ATTR_UNUSED)
 {
 	return &stream->statbuf;
 }
@@ -312,9 +313,11 @@
 	_stream->istream.real_stream = _stream;
 
 	if (_stream->stat == NULL)
-		_stream->stat = _stat;
-	if (_stream->iostream.set_max_buffer_size == NULL)
-		_stream->iostream.set_max_buffer_size = _set_max_buffer_size;
+		_stream->stat = i_stream_default_stat;
+	if (_stream->iostream.set_max_buffer_size == NULL) {
+		_stream->iostream.set_max_buffer_size =
+			i_stream_default_set_max_buffer_size;
+	}
 
 	memset(&_stream->statbuf, 0, sizeof(_stream->statbuf));
 	_stream->statbuf.st_size = -1;
--- a/src/lib/ostream-crlf.c	Sun Sep 16 12:51:41 2007 +0300
+++ b/src/lib/ostream-crlf.c	Sun Sep 16 13:25:23 2007 +0300
@@ -20,7 +20,7 @@
 
 static const struct const_iovec cr_iov = { "\r", 1 };
 
-static void _destroy(struct iostream_private *stream)
+static void o_stream_crlf_destroy(struct iostream_private *stream)
 {
 	struct crlf_ostream *cstream = (struct crlf_ostream *)stream;
 
@@ -28,14 +28,15 @@
 }
 
 static void
-_set_max_buffer_size(struct iostream_private *stream, size_t max_size)
+o_stream_crlf_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_private *stream, bool set)
+static void o_stream_crlf_cork(struct ostream_private *stream, bool set)
 {
 	struct crlf_ostream *cstream = (struct crlf_ostream *)stream;
 
@@ -45,28 +46,29 @@
 		o_stream_uncork(cstream->output);
 }
 
-static int _flush(struct ostream_private *stream)
+static int o_stream_crlf_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_private *stream, bool set)
+static void
+o_stream_crlf_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_private *stream)
+static size_t o_stream_crlf_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_private *stream, uoff_t offset)
+static int o_stream_crlf_seek(struct ostream_private *stream, uoff_t offset)
 {
 	struct crlf_ostream *cstream = (struct crlf_ostream *)stream;
 	int ret;
@@ -106,8 +108,9 @@
 }
 
 static ssize_t
-_sendv_crlf(struct ostream_private *stream, const struct const_iovec *iov,
-	    unsigned int iov_count)
+o_stream_crlf_sendv_crlf(struct ostream_private *stream,
+			 const struct const_iovec *iov,
+			 unsigned int iov_count)
 {
 	struct crlf_ostream *cstream = (struct crlf_ostream *)stream;
 	buffer_t *iov_buf, *diff_buf;
@@ -215,8 +218,9 @@
 }
 
 static ssize_t
-_sendv_lf(struct ostream_private *stream, const struct const_iovec *iov,
-	  unsigned int iov_count)
+o_stream_crlf_sendv_lf(struct ostream_private *stream,
+		       const struct const_iovec *iov,
+		       unsigned int iov_count)
 {
 	struct crlf_ostream *cstream = (struct crlf_ostream *)stream;
 	buffer_t *iov_buf, *diff_buf;
@@ -316,7 +320,8 @@
 }
 
 static off_t
-_send_istream(struct ostream_private *outstream, struct istream *instream)
+o_stream_crlf_send_istream(struct ostream_private *outstream,
+			   struct istream *instream)
 {
 	struct const_iovec iov;
         const unsigned char *data;
@@ -352,15 +357,16 @@
 	cstream->output = output;
 	o_stream_ref(output);
 
-	cstream->ostream.iostream.destroy = _destroy;
-	cstream->ostream.iostream.set_max_buffer_size = _set_max_buffer_size;
+	cstream->ostream.iostream.destroy = o_stream_crlf_destroy;
+	cstream->ostream.iostream.set_max_buffer_size =
+		o_stream_crlf_set_max_buffer_size;
 
-	cstream->ostream.cork = _cork;
-	cstream->ostream.flush = _flush;
-	cstream->ostream.flush_pending = _flush_pending;
-	cstream->ostream.get_used_size = _get_used_size;
-	cstream->ostream.seek = _seek;
-	cstream->ostream.send_istream = _send_istream;
+	cstream->ostream.cork = o_stream_crlf_cork;
+	cstream->ostream.flush = o_stream_crlf_flush;
+	cstream->ostream.flush_pending = o_stream_crlf_flush_pending;
+	cstream->ostream.get_used_size = o_stream_crlf_get_used_size;
+	cstream->ostream.seek = o_stream_crlf_seek;
+	cstream->ostream.send_istream = o_stream_crlf_send_istream;
 	return cstream;
 }
 
@@ -369,7 +375,7 @@
 	struct crlf_ostream *cstream;
 
 	cstream = o_stream_create_common(output);
-	cstream->ostream.sendv = _sendv_crlf;
+	cstream->ostream.sendv = o_stream_crlf_sendv_crlf;
 	return o_stream_create(&cstream->ostream);
 }
 
@@ -378,6 +384,6 @@
 	struct crlf_ostream *cstream;
 
 	cstream = o_stream_create_common(output);
-	cstream->ostream.sendv = _sendv_lf;
+	cstream->ostream.sendv = o_stream_crlf_sendv_lf;
 	return o_stream_create(&cstream->ostream);
 }
--- a/src/lib/ostream-file.c	Sun Sep 16 12:51:41 2007 +0300
+++ b/src/lib/ostream-file.c	Sun Sep 16 13:25:23 2007 +0300
@@ -66,7 +66,7 @@
 	fstream->ostream.ostream.closed = TRUE;
 }
 
-static void _close(struct iostream_private *stream)
+static void o_stream_file_close(struct iostream_private *stream)
 {
 	struct file_ostream *fstream = (struct file_ostream *)stream;
 
@@ -76,7 +76,7 @@
 	stream_closed(fstream);
 }
 
-static void _destroy(struct iostream_private *stream)
+static void o_stream_file_destroy(struct iostream_private *stream)
 {
 	struct file_ostream *fstream = (struct file_ostream *)stream;
 
@@ -84,7 +84,8 @@
 }
 
 static void
-_set_max_buffer_size(struct iostream_private *stream, size_t max_size)
+o_stream_file_set_max_buffer_size(struct iostream_private *stream,
+				  size_t max_size)
 {
 	struct file_ostream *fstream = (struct file_ostream *)stream;
 
@@ -263,7 +264,7 @@
 	return IS_STREAM_EMPTY(fstream) ? 1 : 0;
 }
 
-static void _cork(struct ostream_private *stream, bool set)
+static void o_stream_file_cork(struct ostream_private *stream, bool set)
 {
 	struct file_ostream *fstream = (struct file_ostream *)stream;
 	int ret;
@@ -292,14 +293,15 @@
 	}
 }
 
-static int _flush(struct ostream_private *stream)
+static int o_stream_file_flush(struct ostream_private *stream)
 {
 	struct file_ostream *fstream = (struct file_ostream *) stream;
 
 	return buffer_flush(fstream);
 }
 
-static void _flush_pending(struct ostream_private *stream, bool set)
+static void
+o_stream_file_flush_pending(struct ostream_private *stream, bool set)
 {
 	struct file_ostream *fstream = (struct file_ostream *) stream;
 
@@ -324,14 +326,14 @@
 	}
 }
 
-static size_t _get_used_size(struct ostream_private *stream)
+static size_t o_stream_file_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_private *stream, uoff_t offset)
+static int o_stream_file_seek(struct ostream_private *stream, uoff_t offset)
 {
 	struct file_ostream *fstream = (struct file_ostream *)stream;
 
@@ -398,7 +400,7 @@
 	if (fstream->ostream.callback != NULL)
 		ret = fstream->ostream.callback(fstream->ostream.context);
 	else
-		ret = _flush(&fstream->ostream);
+		ret = o_stream_file_flush(&fstream->ostream);
 
 	if (ret == 0)
 		fstream->flush_pending = TRUE;
@@ -460,9 +462,9 @@
 	return sent;
 }
 
-static ssize_t _sendv(struct ostream_private *stream,
-		      const struct const_iovec *iov,
-		      unsigned int iov_count)
+static ssize_t o_stream_file_sendv(struct ostream_private *stream,
+				   const struct const_iovec *iov,
+				   unsigned int iov_count)
 {
 	struct file_ostream *fstream = (struct file_ostream *)stream;
 	size_t size, total_size, added, optimal_size;
@@ -476,7 +478,7 @@
 	total_size = size;
 
 	if (size > get_unused_space(fstream) && !IS_STREAM_EMPTY(fstream)) {
-		if (_flush(stream) < 0)
+		if (o_stream_file_flush(stream) < 0)
 			return -1;
 	}
 
@@ -714,8 +716,8 @@
 	return (off_t) (in_size - in_start_offset);
 }
 
-static off_t _send_istream(struct ostream_private *outstream,
-			   struct istream *instream)
+static off_t o_stream_file_send_istream(struct ostream_private *outstream,
+					struct istream *instream)
 {
 	struct file_ostream *foutstream = (struct file_ostream *)outstream;
 	const struct stat *st;
@@ -782,17 +784,18 @@
 	fstream->autoclose_fd = autoclose_fd;
 	fstream->optimal_block_size = DEFAULT_OPTIMAL_BLOCK_SIZE;
 
-	fstream->ostream.iostream.close = _close;
-	fstream->ostream.iostream.destroy = _destroy;
-	fstream->ostream.iostream.set_max_buffer_size = _set_max_buffer_size;
+	fstream->ostream.iostream.close = o_stream_file_close;
+	fstream->ostream.iostream.destroy = o_stream_file_destroy;
+	fstream->ostream.iostream.set_max_buffer_size =
+		o_stream_file_set_max_buffer_size;
 
-	fstream->ostream.cork = _cork;
-	fstream->ostream.flush = _flush;
-	fstream->ostream.flush_pending = _flush_pending;
-	fstream->ostream.get_used_size = _get_used_size;
-	fstream->ostream.seek = _seek;
-	fstream->ostream.sendv = _sendv;
-	fstream->ostream.send_istream = _send_istream;
+	fstream->ostream.cork = o_stream_file_cork;
+	fstream->ostream.flush = o_stream_file_flush;
+	fstream->ostream.flush_pending = o_stream_file_flush_pending;
+	fstream->ostream.get_used_size = o_stream_file_get_used_size;
+	fstream->ostream.seek = o_stream_file_seek;
+	fstream->ostream.sendv = o_stream_file_sendv;
+	fstream->ostream.send_istream = o_stream_file_send_istream;
 
 	return fstream;
 }
--- a/src/lib/sha1.c	Sun Sep 16 12:51:41 2007 +0300
+++ b/src/lib/sha1.c	Sun Sep 16 13:25:23 2007 +0300
@@ -39,8 +39,8 @@
 #include "safe-memset.h"
 
 /* constant table */
-static uint32_t _K[] = { 0x5a827999, 0x6ed9eba1, 0x8f1bbcdc, 0xca62c1d6 };
-#define	K(t)	_K[(t) / 20]
+static uint32_t SHA1_K[] = { 0x5a827999, 0x6ed9eba1, 0x8f1bbcdc, 0xca62c1d6 };
+#define	K(t)	SHA1_K[(t) / 20]
 
 #define	F0(b, c, d)	(((b) & (c)) | ((~(b)) & (d)))
 #define	F1(b, c, d)	(((b) ^ (c)) ^ (d))
--- a/src/lib/strfuncs.c	Sun Sep 16 12:51:41 2007 +0300
+++ b/src/lib/strfuncs.c	Sun Sep 16 13:25:23 2007 +0300
@@ -443,7 +443,7 @@
 }
 
 static char **
-_strsplit(pool_t pool, const char *data, const char *separators, int spaces)
+split_str(pool_t pool, const char *data, const char *separators, int spaces)
 {
         char **array;
 	char *str;
@@ -502,25 +502,25 @@
 
 const char **t_strsplit(const char *data, const char *separators)
 {
-	return (const char **)_strsplit(unsafe_data_stack_pool, data,
+	return (const char **)split_str(unsafe_data_stack_pool, data,
 					separators, FALSE);
 }
 
 const char **t_strsplit_spaces(const char *data, const char *separators)
 {
-	return (const char **)_strsplit(unsafe_data_stack_pool, data,
+	return (const char **)split_str(unsafe_data_stack_pool, data,
 					separators, TRUE);
 }
 
 char **p_strsplit(pool_t pool, const char *data, const char *separators)
 {
-	return _strsplit(pool, data, separators, FALSE);
+	return split_str(pool, data, separators, FALSE);
 }
 
 char **p_strsplit_spaces(pool_t pool, const char *data,
 			 const char *separators)
 {
-	return _strsplit(pool, data, separators, TRUE);
+	return split_str(pool, data, separators, TRUE);
 }
 
 void p_strsplit_free(pool_t pool, char **arr)
--- a/src/plugins/zlib/istream-zlib.c	Sun Sep 16 12:51:41 2007 +0300
+++ b/src/plugins/zlib/istream-zlib.c	Sun Sep 16 13:25:23 2007 +0300
@@ -21,7 +21,7 @@
 	unsigned int marked:1;
 };
 
-static void _close(struct iostream_private *stream)
+static void i_stream_zlib_close(struct iostream_private *stream)
 {
 	struct zlib_istream *zstream = (struct zlib_istream *)stream;
 
@@ -31,14 +31,14 @@
 	}
 }
 
-static void _destroy(struct iostream_private *stream ATTR_UNUSED)
+static void i_stream_zlib_destroy(struct iostream_private *stream ATTR_UNUSED)
 {
 	struct istream_private *_stream = (struct istream_private *)stream;
 
 	i_free(_stream->w_buffer);
 }
 
-static ssize_t _read(struct istream_private *stream)
+static ssize_t i_stream_zlib_read(struct istream_private *stream)
 {
 	struct zlib_istream *zstream = (struct zlib_istream *)stream;
 	size_t size;
@@ -107,7 +107,8 @@
 	return ret;
 }
 
-static void _seek(struct istream_private *stream, uoff_t v_offset, bool mark)
+static void
+i_stream_zlib_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;
@@ -137,7 +138,7 @@
 			}
 
 			i_stream_skip(&stream->istream, avail);
-		} while (_read(stream) >= 0);
+		} while (i_stream_zlib_read(stream) >= 0);
 
 		if (stream->istream.v_offset != v_offset) {
 			/* some failure, we've broken it */
@@ -159,7 +160,8 @@
 	}
 }
 
-static const struct stat *_stat(struct istream_private *stream, bool exact)
+static const struct stat *
+i_stream_zlib_stat(struct istream_private *stream, bool exact)
 {
 	struct zlib_istream *zstream = (struct zlib_istream *) stream;
 	size_t size;
@@ -177,7 +179,7 @@
 		do {
 			(void)i_stream_get_data(&stream->istream, &size);
 			i_stream_skip(&stream->istream, size);
-		} while (_read(stream) > 0);
+		} while (i_stream_zlib_read(stream) > 0);
 
 		zstream->cached_size = stream->istream.v_offset;
 		i_stream_seek(&stream->istream, old_offset);
@@ -186,7 +188,7 @@
 	return &stream->statbuf;
 }
 
-static void _sync(struct istream_private *stream)
+static void i_stream_zlib_sync(struct istream_private *stream)
 {
 	struct zlib_istream *zstream = (struct zlib_istream *) stream;
 
@@ -203,14 +205,14 @@
 	zstream->file = gzdopen(fd, "r");
 	zstream->cached_size = (uoff_t)-1;
 
-	zstream->istream.iostream.close = _close;
-	zstream->istream.iostream.destroy = _destroy;
+	zstream->istream.iostream.close = i_stream_zlib_close;
+	zstream->istream.iostream.destroy = i_stream_zlib_destroy;
 
 	zstream->istream.max_buffer_size = DEFAULT_MAX_BUFFER_SIZE;
-	zstream->istream.read = _read;
-	zstream->istream.seek = _seek;
-	zstream->istream.stat = _stat;
-	zstream->istream.sync = _sync;
+	zstream->istream.read = i_stream_zlib_read;
+	zstream->istream.seek = i_stream_zlib_seek;
+	zstream->istream.stat = i_stream_zlib_stat;
+	zstream->istream.sync = i_stream_zlib_sync;
 
 	/* if it's a file, set the flags properly */
 	if (fstat(fd, &st) == 0 && S_ISREG(st.st_mode)) {