global: Use o_stream_flush_parent()

diff --git a/src/lib-compression/ostream-bzlib.c b/src/lib-compression/ostream-bzlib.c
index fc6aabd7051e1a35668a856765e487d63fff1fa2..b17acad9a7242a6a9f4c142296075aae56f300bc 100644 (file)
--- a/src/lib-compression/ostream-bzlib.c
+++ b/src/lib-compression/ostream-bzlib.c
@@ -145,15 +145,11 @@ static int o_stream_bzlib_send_flush(struct bzlib_ostream *zstream)
 static int o_stream_bzlib_flush(struct ostream_private *stream)
 {
        struct bzlib_ostream *zstream = (struct bzlib_ostream *)stream;
-       int ret;
 
        if (o_stream_bzlib_send_flush(zstream) < 0)
                return -1;
 
-       ret = o_stream_flush(stream->parent);
-       if (ret < 0)
-               o_stream_copy_error_from_parent(stream);
-       return ret;
+       return o_stream_flush_parent(stream);
 }
 
 static ssize_t

diff --git a/src/lib-compression/ostream-lz4.c b/src/lib-compression/ostream-lz4.c
index 155572003c742549915425cd7671a7b05e694ac7..10faf48f944c4056dc0c1935a66495f2bfee3d34 100644 (file)
--- a/src/lib-compression/ostream-lz4.c
+++ b/src/lib-compression/ostream-lz4.c
@@ -137,17 +137,13 @@ o_stream_lz4_send_chunk(struct lz4_ostream *zstream,
 static int o_stream_lz4_flush(struct ostream_private *stream)
 {
        struct lz4_ostream *zstream = (struct lz4_ostream *)stream;
-       int ret;
 
        if (o_stream_lz4_compress(zstream) < 0)
                return -1;
        if (o_stream_lz4_send_outbuf(zstream) < 0)
                return -1;
 
-       ret = o_stream_flush(stream->parent);
-       if (ret < 0)
-               o_stream_copy_error_from_parent(stream);
-       return ret;
+       return o_stream_flush_parent(stream);
 }
 
 static ssize_t

diff --git a/src/lib-compression/ostream-lzma.c b/src/lib-compression/ostream-lzma.c
index 0e57286f464ac85302604082d12643db8b910298..f78ceec5eedfc3f3709edbf3db199e8fb5cfe7d9 100644 (file)
--- a/src/lib-compression/ostream-lzma.c
+++ b/src/lib-compression/ostream-lzma.c
@@ -153,15 +153,11 @@ static int o_stream_lzma_send_flush(struct lzma_ostream *zstream)
 static int o_stream_lzma_flush(struct ostream_private *stream)
 {
        struct lzma_ostream *zstream = (struct lzma_ostream *)stream;
-       int ret;
 
        if (o_stream_lzma_send_flush(zstream) < 0)
                return -1;
 
-       ret = o_stream_flush(stream->parent);
-       if (ret < 0)
-               o_stream_copy_error_from_parent(stream);
-       return ret;
+       return o_stream_flush_parent(stream);
 }
 
 static ssize_t

diff --git a/src/lib-compression/ostream-zlib.c b/src/lib-compression/ostream-zlib.c
index b2b3bde338bef9737d5b080b6f4b024b0de32532..295536a1d7ec8e25bfa5d7fb815c9c58e45f2f12 100644 (file)
--- a/src/lib-compression/ostream-zlib.c
+++ b/src/lib-compression/ostream-zlib.c
@@ -229,15 +229,11 @@ o_stream_zlib_send_flush(struct zlib_ostream *zstream, bool final)
 static int o_stream_zlib_flush(struct ostream_private *stream)
 {
        struct zlib_ostream *zstream = (struct zlib_ostream *)stream;
-       int ret;
 
        if (o_stream_zlib_send_flush(zstream, stream->finished) < 0)
                return -1;
 
-       ret = o_stream_flush(stream->parent);
-       if (ret < 0)
-               o_stream_copy_error_from_parent(stream);
-       return ret;
+       return o_stream_flush_parent(stream);
 }
 
 static ssize_t

diff --git a/src/lib-dcrypt/ostream-encrypt.c b/src/lib-dcrypt/ostream-encrypt.c
index 300fd427d7a9d7973481c7ecc7c168161b9899fe..5e11af192abaed5143c717e57d51067e618a0ece 100644 (file)
--- a/src/lib-dcrypt/ostream-encrypt.c
+++ b/src/lib-dcrypt/ostream-encrypt.c
@@ -540,7 +540,6 @@ static
 int o_stream_encrypt_flush(struct ostream_private *stream)
 {
        struct encrypt_ostream *estream = (struct encrypt_ostream *)stream;
-       int ret;
 
        if (stream->finished && estream->ctx_sym != NULL &&
            !estream->finalized) {
@@ -548,9 +547,7 @@ int o_stream_encrypt_flush(struct ostream_private *stream)
                        return -1;
        }
 
-       if ((ret = o_stream_flush(stream->parent)) < 0)
-               o_stream_copy_error_from_parent(stream);
-       return ret;
+       return o_stream_flush_parent(stream);
 }
 
 static

diff --git a/src/lib-mail/ostream-dot.c b/src/lib-mail/ostream-dot.c
index d386380176240b3661a616d1bc5e728eca08cb0a..147651df0f4f0040ea3197f411172f12a5268b7e 100644 (file)
--- a/src/lib-mail/ostream-dot.c
+++ b/src/lib-mail/ostream-dot.c
@@ -59,9 +59,7 @@ o_stream_dot_flush(struct ostream_private *stream)
                        return ret;
        }
 
-       if ((ret = o_stream_flush(stream->parent)) < 0)
-               o_stream_copy_error_from_parent(stream);
-       return ret;
+       return o_stream_flush_parent(stream);
 }
 
 static void

diff --git a/src/lib/ostream-escaped.c b/src/lib/ostream-escaped.c
index 080e88e65aa8a4682356904030a10fc60ee426ed..af1ecc8884a591886679a38d1f2f42c7d7f7b386 100644 (file)
--- a/src/lib/ostream-escaped.c
+++ b/src/lib/ostream-escaped.c
@@ -97,9 +97,7 @@ o_stream_escaped_flush(struct ostream_private *stream)
 
        if ((ret = o_stream_escaped_send_outbuf(estream)) <= 0)
                return ret;
-       if ((ret = o_stream_flush(stream->parent)) < 0)
-               o_stream_copy_error_from_parent(stream);
-       return ret;
+       return o_stream_flush_parent(stream);
 }
 
 static void o_stream_escaped_destroy(struct iostream_private *stream)

diff --git a/src/lib/ostream-failure-at.c b/src/lib/ostream-failure-at.c
index 7f88771327bcd81c32844c822bc0f51bf038ec7d..0d12cd4ad868ead57e84f13f5c3f6945875711be 100644 (file)
--- a/src/lib/ostream-failure-at.c
+++ b/src/lib/ostream-failure-at.c
@@ -88,7 +88,7 @@ o_stream_failure_at_flush(struct ostream_private *stream)
                stream->ostream.stream_errno = errno = EIO;
                return -1;
        }
-       return o_stream_flush(stream->parent);
+       return o_stream_flush_parent(stream);
 }
 
 struct ostream *

diff --git a/src/lib/ostream.c b/src/lib/ostream.c
index 2f6379a5cdb67f8d35f27af647d2134ea7a39508..7985fc9efda0d6b2897986ded0917b2a2b099980 100644 (file)
--- a/src/lib/ostream.c
+++ b/src/lib/ostream.c
@@ -561,14 +561,10 @@ int o_stream_flush_parent(struct ostream_private *_stream)
 
 static int o_stream_default_flush(struct ostream_private *_stream)
 {
-       int ret;
-
        if (_stream->parent == NULL)
                return 1;
 
-       if ((ret = o_stream_flush(_stream->parent)) < 0)
-               o_stream_copy_error_from_parent(_stream);
-       return ret;
+       return o_stream_flush_parent(_stream);
 }
 
 static void

diff --git a/src/plugins/mail-filter/ostream-ext-filter.c b/src/plugins/mail-filter/ostream-ext-filter.c
index 8d20b7bf2878e875c664913df3122ffb2eb16fee..238999bdb1cf886fcf1df783ca8dcbe48ef4b646 100644 (file)
--- a/src/plugins/mail-filter/ostream-ext-filter.c
+++ b/src/plugins/mail-filter/ostream-ext-filter.c
@@ -118,9 +118,7 @@ static int o_stream_mail_filter_flush(struct ostream_private *stream)
                if ((ret = o_stream_mail_filter_finish(stream)) <= 0)
                        return ret;
        }
-       if ((ret = o_stream_flush(stream->parent)) < 0)
-               o_stream_copy_error_from_parent(stream);
-       return ret;
+       return o_stream_flush_parent(stream);
 }
 
 static int filter_connect(struct mail_filter_ostream *mstream,