dovecot: Renamed struct _[io]stream to struct [io]stream_private...
dovecot at dovecot.org
dovecot at dovecot.org
Sun Sep 16 13:53:15 EEST 2007
details: http://hg.dovecot.org/dovecot/rev/b0096861c390
changeset: 6415:b0096861c390
user: Timo Sirainen <tss at iki.fi>
date: Sun Sep 16 12:22:27 2007 +0300
description:
Renamed struct _[io]stream to struct [io]stream_private. Also removed _
prefix from _[io]stream_*() functions.
diffstat:
19 files changed, 229 insertions(+), 214 deletions(-)
src/lib-mail/istream-header-filter.c | 27 ++++++------
src/lib-storage/index/mbox/istream-raw-mbox.c | 27 ++++++------
src/lib/iostream-internal.h | 20 +++++----
src/lib/iostream.c | 11 ++---
src/lib/istream-data.c | 14 +++---
src/lib/istream-file.c | 26 ++++++------
src/lib/istream-internal.h | 20 +++++----
src/lib/istream-limit.c | 21 +++++----
src/lib/istream-mmap.c | 20 ++++-----
src/lib/istream-seekable.c | 21 +++++----
src/lib/istream-tee.c | 23 +++++-----
src/lib/istream.c | 53 ++++++++++++-------------
src/lib/istream.h | 2
src/lib/ostream-crlf.c | 37 ++++++++---------
src/lib/ostream-file.c | 35 ++++++++--------
src/lib/ostream-internal.h | 21 +++++----
src/lib/ostream.c | 33 +++++++--------
src/lib/ostream.h | 2
src/plugins/zlib/istream-zlib.c | 30 +++++++-------
diffs (truncated from 1518 to 300 lines):
diff -r a6a49d5efc59 -r b0096861c390 src/lib-mail/istream-header-filter.c
--- 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 @@ struct header_filter_istream {
header_filter_callback *null_header_filter_callback = NULL;
-static void _close(struct _iostream *stream ATTR_UNUSED)
-{
-}
-
-static void _destroy(struct _iostream *stream)
+static void _close(struct iostream_private *stream ATTR_UNUSED)
+{
+}
+
+static void _destroy(struct iostream_private *stream)
{
struct header_filter_istream *mstream =
(struct header_filter_istream *)stream;
@@ -52,7 +52,8 @@ static void _destroy(struct _iostream *s
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 @@ static ssize_t read_header(struct header
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 parse_header(struct header_f
}
}
-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 _seek(struct _istream *strea
}
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 @@ i_stream_create_header_filter(struct ist
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);
+}
diff -r a6a49d5efc59 -r b0096861c390 src/lib-storage/index/mbox/istream-raw-mbox.c
--- 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 @@ struct raw_mbox_istream {
unsigned int eof:1;
};
-static void _close(struct _iostream *stream ATTR_UNUSED)
-{
-}
-
-static void _destroy(struct _iostream *stream)
+static void _close(struct iostream_private *stream ATTR_UNUSED)
+{
+}
+
+static void _destroy(struct iostream_private *stream)
{
struct raw_mbox_istream *rstream = (struct raw_mbox_istream *)stream;
@@ -37,7 +37,8 @@ static void _destroy(struct _iostream *s
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 void handle_end_of_mail(struct ra
}
}
-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 @@ static ssize_t _read(struct _istream *st
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 @@ static void _seek(struct _istream *strea
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 @@ static void _sync(struct _istream *strea
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 @@ struct istream *i_stream_create_raw_mbox
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)
diff -r a6a49d5efc59 -r b0096861c390 src/lib/iostream-internal.h
--- 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
diff -r a6a49d5efc59 -r b0096861c390 src/lib/iostream.c
--- 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 @@ void _io_stream_unref(struct _iostream *
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);
}
diff -r a6a49d5efc59 -r b0096861c390 src/lib/istream-data.c
--- 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 @@ static void _seek(struct _istream *strea
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 @@ struct istream *i_stream_create_from_dat
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;
}
diff -r a6a49d5efc59 -r b0096861c390 src/lib/istream-file.c
--- 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;
More information about the dovecot-cvs
mailing list