dovecot-2.2: Minor code cleanup

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.2/rev/5420e5c93bda
changeset: 15021:5420e5c93bda
user:      Timo Sirainen <tss at iki.fi>
date:      Tue Sep 04 16:23:12 2012 +0300
description:
Minor code cleanup

diffstat:

 src/lib-mail/istream-attachment-extractor.c |  14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diffs (51 lines):

diff -r 169385092bae -r 5420e5c93bda src/lib-mail/istream-attachment-extractor.c
--- a/src/lib-mail/istream-attachment-extractor.c	Tue Sep 04 16:22:14 2012 +0300
+++ b/src/lib-mail/istream-attachment-extractor.c	Tue Sep 04 16:23:12 2012 +0300
@@ -549,8 +549,7 @@
 	return ret;
 }
 
-static int
-i_stream_attachment_read_next(struct attachment_istream *astream, bool *retry_r)
+static int astream_read_next(struct attachment_istream *astream, bool *retry_r)
 {
 	struct istream_private *stream = &astream->istream;
 	struct message_block block;
@@ -612,7 +611,8 @@
 	return new_size - old_size;
 }
 
-static ssize_t i_stream_attachment_read(struct istream_private *stream)
+static ssize_t
+i_stream_attachment_extractor_read(struct istream_private *stream)
 {
 	struct attachment_istream *astream =
 		(struct attachment_istream *)stream;
@@ -620,14 +620,14 @@
 	ssize_t ret;
 
 	do {
-		ret = i_stream_attachment_read_next(astream, &retry);
+		ret = astream_read_next(astream, &retry);
 	} while (retry && astream->set.drain_parent_input);
 
 	astream->retry_read = retry;
 	return ret;
 }
 
-static void i_stream_attachment_close(struct iostream_private *stream)
+static void i_stream_attachment_extractor_close(struct iostream_private *stream)
 {
 	struct attachment_istream *astream =
 		(struct attachment_istream *)stream;
@@ -666,8 +666,8 @@
 
 	astream->istream.max_buffer_size = input->real_stream->max_buffer_size;
 
-	astream->istream.read = i_stream_attachment_read;
-	astream->istream.iostream.close = i_stream_attachment_close;
+	astream->istream.read = i_stream_attachment_extractor_read;
+	astream->istream.iostream.close = i_stream_attachment_extractor_close;
 
 	astream->istream.istream.readable_fd = FALSE;
 	astream->istream.istream.blocking = input->blocking;