# HG changeset patch # User Timo Sirainen # Date 1507639059 -10800 # Node ID f36d7c6d7533da1ce4ce8bed23ebecbadbf9a6a6 # Parent 09164094f25414ef41de4260130e65b3bdfb370b lib: ostream-multiplex - remove unnecessary flushes diff -r 09164094f254 -r f36d7c6d7533 src/lib/ostream-multiplex.c --- 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);