From c1f5ec50aa2d9f1efe2d75eac04e75aa6c7049c7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Martti=20Rannanj=C3=A4rvi?= Date: Wed, 20 Apr 2016 14:51:22 +0300 Subject: [PATCH] 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. --- src/lib-http/http-server-request.c | 2 -- src/lib-http/http-transfer-chunked.c | 2 -- src/lib-mail/istream-header-filter.c | 1 - src/lib-storage/index/mbox/istream-raw-mbox.c | 1 - 4 files changed, 6 deletions(-) diff --git a/src/lib-http/http-server-request.c b/src/lib-http/http-server-request.c index 34d7a3744c..d263669840 100644 --- 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 b8ab4073a7..935f53b168 100644 --- 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 af36a43d8c..2ac1f90a4d 100644 --- 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 5b1ae30869..32f381a994 100644 --- 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) -- 2.47.3