Mercurial > dovecot > core-2.2

changeset 22602:f36d7c6d7533

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
lib: ostream-multiplex - remove unnecessary flushes
author Timo Sirainen <timo.sirainen@dovecot.fi>
date Tue, 10 Oct 2017 15:37:39 +0300
parents 09164094f254
children c6ad67e373f5
files src/lib/ostream-multiplex.c
diffstat 1 files changed, 1 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/src/lib/ostream-multiplex.c	Tue Oct 10 12:33:08 2017 +0300
+++ b/src/lib/ostream-multiplex.c	Tue Oct 10 15:37:39 2017 +0300
@@ -68,7 +68,7 @@
 o_stream_multiplex_sendv(struct multiplex_ostream *mstream)
 {
 	struct multiplex_ochannel *channel;
-	ssize_t ret = 0, ret2;
+	ssize_t ret = 0;
 	if (mstream->bufsize <= mstream->wbuf->used + 5)
 		return -2;
 
@@ -93,10 +93,6 @@
 			propagate_error(mstream, mstream->parent->stream_errno);
 			return ret;
 		}
-		if ((ret2 = o_stream_flush(mstream->parent)) < 0) {
-			propagate_error(mstream, mstream->parent->stream_errno);
-			return ret2;
-		}
 		buffer_delete(mstream->wbuf, 0, ret);
 	}
 	return ret;
@@ -153,7 +149,6 @@
 	array_foreach_modifiable(&mstream->channels, channelp)
 		if (*channelp != NULL)
 			return;
-	o_stream_flush(mstream->parent);
 	o_stream_unref(&mstream->parent);
 	array_free(&mstream->channels);
 	buffer_free(&mstream->wbuf);