dovecot: Moved stream_errno clearing to common functions in ostr...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot/rev/e722bcdd426e
changeset: 6849:e722bcdd426e
user:      Timo Sirainen <tss at iki.fi>
date:      Sat Nov 24 06:43:49 2007 +0200
description:
Moved stream_errno clearing to common functions in ostream.c.

diffstat:

2 files changed, 4 insertions(+), 4 deletions(-)
src/lib/ostream-file.c |    4 ----
src/lib/ostream.c      |    4 ++++

diffs (63 lines):

diff -r b73cb35a8427 -r e722bcdd426e src/lib/ostream-file.c
--- a/src/lib/ostream-file.c	Sat Nov 24 06:40:09 2007 +0200
+++ b/src/lib/ostream-file.c	Sat Nov 24 06:43:49 2007 +0200
@@ -345,7 +345,6 @@ static int o_stream_file_seek(struct ost
 	if (buffer_flush(fstream) < 0)
 		return -1;
 
-	stream->ostream.stream_errno = 0;
 	stream->ostream.offset = offset;
 	fstream->buffer_offset = offset;
 	return 1;
@@ -470,8 +469,6 @@ static ssize_t o_stream_file_sendv(struc
 	size_t size, total_size, added, optimal_size;
 	unsigned int i;
 	ssize_t ret = 0;
-
-	stream->ostream.stream_errno = 0;
 
 	for (i = 0, size = 0; i < iov_count; i++)
 		size += iov[i].iov_len;
@@ -731,7 +728,6 @@ static off_t o_stream_file_send_istream(
 
 	in_fd = i_stream_get_fd(instream);
 
-	outstream->ostream.stream_errno = 0;
 	if (in_fd == foutstream->fd) {
 		/* copying data within same fd. we'll have to be careful with
 		   seeks and overlapping writes. */
diff -r b73cb35a8427 -r e722bcdd426e src/lib/ostream.c
--- a/src/lib/ostream.c	Sat Nov 24 06:40:09 2007 +0200
+++ b/src/lib/ostream.c	Sat Nov 24 06:43:49 2007 +0200
@@ -78,6 +78,7 @@ int o_stream_flush(struct ostream *strea
 	if (unlikely(stream->closed))
 		return -1;
 
+	stream->stream_errno = 0;
 	return _stream->flush(_stream);
 }
 
@@ -105,6 +106,7 @@ int o_stream_seek(struct ostream *stream
 	if (unlikely(stream->closed))
 		return -1;
 
+	stream->stream_errno = 0;
 	return _stream->seek(_stream, offset);
 }
 
@@ -129,6 +131,7 @@ ssize_t o_stream_sendv(struct ostream *s
 	if (unlikely(stream->closed))
 		return -1;
 
+	stream->stream_errno = 0;
 	for (i = 0, total_size = 0; i < iov_count; i++)
 		total_size += iov[i].iov_len;
 
@@ -152,6 +155,7 @@ off_t o_stream_send_istream(struct ostre
 	if (unlikely(outstream->closed || instream->closed))
 		return -1;
 
+	outstream->stream_errno = 0;
 	ret = _outstream->send_istream(_outstream, instream);
 	if (unlikely(ret < 0))
 		errno = outstream->stream_errno;