From 95c4374dc6b4bd7cbbc7b8cc2006831441bba5e3 Mon Sep 17 00:00:00 2001 From: Timo Sirainen Date: Tue, 10 Oct 2017 15:37:39 +0300 Subject: [PATCH] lib: ostream-multiplex - remove unnecessary flushes --- src/lib/ostream-multiplex.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/lib/ostream-multiplex.c b/src/lib/ostream-multiplex.c index fe613f2847..14e703e75b 100644 --- a/src/lib/ostream-multiplex.c +++ b/src/lib/ostream-multiplex.c @@ -68,7 +68,7 @@ static ssize_t 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 @@ o_stream_multiplex_sendv(struct multiplex_ostream *mstream) 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 @@ static void o_stream_multiplex_try_destroy(struct multiplex_ostream *mstream) 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); -- 2.47.3