lib-http, lib-mail, lib-storage: parent unrefs

Remove some unneccesary parent unrefs from i_stream_*_destroys. Don't
know too many or too few were removed.

diff --git a/src/lib-http/http-server-request.c b/src/lib-http/http-server-request.c
index 34d7a3744ce54fe4b27c9a036fae359bcebacfb1..d263669840cf610a147b94a879814c449c82319c 100644 (file)
--- a/src/lib-http/http-server-request.c
+++ b/src/lib-http/http-server-request.c
@@ -478,8 +478,6 @@ http_server_istream_destroy(struct iostream_private *stream)
                /* get to same position in parent stream */
                i_stream_seek(hsristream->istream.parent, v_offset);
        }
-
-       i_stream_unref(&hsristream->istream.parent);
 }
 
 struct istream *

diff --git a/src/lib-http/http-transfer-chunked.c b/src/lib-http/http-transfer-chunked.c
index b8ab4073a711f76aa614f67e52eb6812927ac620..935f53b168d3af6a2102dc1921bfd6189c50d5dd 100644 (file)
--- a/src/lib-http/http-transfer-chunked.c
+++ b/src/lib-http/http-transfer-chunked.c
@@ -497,8 +497,6 @@ http_transfer_chunked_istream_destroy(struct iostream_private *stream)
 
        // FIXME: copied from istream.c; there's got to be a better way.
        i_free(tcstream->istream.w_buffer);
-       if (tcstream->istream.parent != NULL)
-               i_stream_unref(&tcstream->istream.parent);
 }
 
 struct istream *

diff --git a/src/lib-mail/istream-header-filter.c b/src/lib-mail/istream-header-filter.c
index af36a43d8c0cf5feb5b5a18dc16a9b6eb5175301..2ac1f90a4d9e6f4c425567bff5668a19f04df89f 100644 (file)
--- a/src/lib-mail/istream-header-filter.c
+++ b/src/lib-mail/istream-header-filter.c
@@ -52,7 +52,6 @@ static void i_stream_header_filter_destroy(struct iostream_private *stream)
 
        if (mstream->hdr_ctx != NULL)
                message_parse_header_deinit(&mstream->hdr_ctx);
-       i_stream_unref(&mstream->istream.parent);
        if (array_is_created(&mstream->match_change_lines))
                array_free(&mstream->match_change_lines);
        pool_unref(&mstream->pool);

diff --git a/src/lib-storage/index/mbox/istream-raw-mbox.c b/src/lib-storage/index/mbox/istream-raw-mbox.c
index 5b1ae308698f8ad007ade4051d344ec52d2d2e17..32f381a994e5527c07790ec762efc2e49753e706 100644 (file)
--- a/src/lib-storage/index/mbox/istream-raw-mbox.c
+++ b/src/lib-storage/index/mbox/istream-raw-mbox.c
@@ -33,7 +33,6 @@ static void i_stream_raw_mbox_destroy(struct iostream_private *stream)
 
        i_stream_seek(rstream->istream.parent,
                      rstream->istream.istream.v_offset);
-       i_stream_unref(&rstream->istream.parent);
 }
 
 static int mbox_read_from_line(struct raw_mbox_istream *rstream)