global: Use i_stream_free_buffer() instead of freeing w_buffer directly

diff --git a/src/lib-http/http-transfer-chunked.c b/src/lib-http/http-transfer-chunked.c
index 3aa51a4b7454b2d3add41438d54fe03b84381912..46c6de860e09626f6cadd6816af70ec8a83d464c 100644 (file)
--- a/src/lib-http/http-transfer-chunked.c
+++ b/src/lib-http/http-transfer-chunked.c
@@ -495,7 +495,7 @@ http_transfer_chunked_istream_destroy(struct iostream_private *stream)
                http_header_parser_deinit(&tcstream->header_parser);
 
        // FIXME: copied from istream.c; there's got to be a better way.
-       i_free(tcstream->istream.w_buffer);
+       i_stream_free_buffer(&tcstream->istream);
 }
 
 struct istream *

diff --git a/src/lib-ssl-iostream/istream-openssl.c b/src/lib-ssl-iostream/istream-openssl.c
index 12f479c17e45e50ed1b45d17b1f4c58991d5c98d..5b97acd2f3df7117cf97f568057c061515e7130f 100644 (file)
--- a/src/lib-ssl-iostream/istream-openssl.c
+++ b/src/lib-ssl-iostream/istream-openssl.c
@@ -23,7 +23,7 @@ static void i_stream_ssl_destroy(struct iostream_private *stream)
 {
        struct ssl_istream *sstream = (struct ssl_istream *)stream;
 
-       i_free(sstream->istream.w_buffer);
+       i_stream_free_buffer(&sstream->istream);
        sstream->ssl_io->ssl_input = NULL;
        ssl_iostream_unref(&sstream->ssl_io);
 }

diff --git a/src/lib/istream-chain.c b/src/lib/istream-chain.c
index d192204c5e39db290b1a03d61e646102c63bce20..064ca7ce08c2e28915b4ca1f33c332e1aa573657 100644 (file)
--- a/src/lib/istream-chain.c
+++ b/src/lib/istream-chain.c
@@ -107,7 +107,7 @@ static void i_stream_chain_destroy(struct iostream_private *stream)
                i_free(link);
                link = next;
        }
-       i_free(cstream->istream.w_buffer);
+       i_stream_free_buffer(&cstream->istream);
 }
 
 static void i_stream_chain_read_next(struct chain_istream *cstream)

diff --git a/src/lib/istream-concat.c b/src/lib/istream-concat.c
index 29ecfdd8a7cae1d839621ab99fa443e1e529f0b1..fe0ce1f0f92e3e7fcb8c74d61f56c1cfab07b937 100644 (file)
--- a/src/lib/istream-concat.c
+++ b/src/lib/istream-concat.c
@@ -46,7 +46,7 @@ static void i_stream_concat_destroy(struct iostream_private *stream)
                i_stream_unref(&cstream->input[i]);
        i_free(cstream->input);
        i_free(cstream->input_size);
-       i_free(cstream->istream.w_buffer);
+       i_stream_free_buffer(&cstream->istream);
 }
 
 static void

diff --git a/src/lib/istream-multiplex.c b/src/lib/istream-multiplex.c
index b2a70d0d4e27e7ebf4f484c9266fef9f3ba73657..186472a64da758a537f4ac04918bd5558ed73563 100644 (file)
--- a/src/lib/istream-multiplex.c
+++ b/src/lib/istream-multiplex.c
@@ -220,7 +220,7 @@ static void i_stream_multiplex_ichannel_destroy(struct iostream_private *stream)
        struct multiplex_ichannel **channelp;
        struct multiplex_ichannel *channel = (struct multiplex_ichannel*)stream;
        i_stream_multiplex_ichannel_close(stream, TRUE);
-       i_free(channel->istream.w_buffer);
+       i_stream_free_buffer(&channel->istream);
        array_foreach_modifiable(&channel->mstream->channels, channelp) {
                if (*channelp == channel) {
                        *channelp = NULL;

diff --git a/src/lib/istream.c b/src/lib/istream.c
index 0c6a6129c148296f317c040f8081c63da3dce140..b8ef94a462f25f48f09087da8bfbf0f2b99291b4 100644 (file)
--- a/src/lib/istream.c
+++ b/src/lib/istream.c
@@ -298,8 +298,7 @@ void i_stream_skip(struct istream *stream, uoff_t count)
                if (_stream->nonpersistent_buffers &&
                    _stream->skip == _stream->pos) {
                        _stream->skip = _stream->pos = 0;
-                       _stream->buffer_size = 0;
-                       i_free_and_null(_stream->w_buffer);
+                       i_stream_free_buffer(_stream);
                }
                return;
        }
@@ -792,7 +791,7 @@ static void i_stream_default_destroy(struct iostream_private *stream)
 {
        struct istream_private *_stream = (struct istream_private *)stream;
 
-       i_free(_stream->w_buffer);
+       i_stream_free_buffer(_stream);
        i_stream_unref(&_stream->parent);
 }