lib: istream - Remove try_alloc_limit.

diff --git a/src/lib/istream-private.h b/src/lib/istream-private.h
index e8542b264eff7ec4691d30c684e4f2e800a58523..7666bee5a5025c737bb61594cfa278c392fb6727 100644 (file)
--- a/src/lib/istream-private.h
+++ b/src/lib/istream-private.h
@@ -38,7 +38,7 @@ struct istream_private {
        unsigned char *w_buffer; /* may be NULL */
 
        size_t buffer_size, max_buffer_size, init_buffer_size, data_limit;
-       size_t skip, pos, try_alloc_limit;
+       size_t skip, pos;
        /* If seeking backwards within the buffer, the next read() will
           return again pos..high_pos */
        size_t high_pos;

diff --git a/src/lib/istream.c b/src/lib/istream.c
index bf539c7e3a272493481c3bbfe7c91c2be73c2137..fd37dc958eb3e1ef3db07d3e465b243414f1b709 100644 (file)
--- a/src/lib/istream.c
+++ b/src/lib/istream.c
@@ -909,12 +909,9 @@ bool i_stream_try_alloc(struct istream_private *stream,
        }
 
        if (stream->data_limit == 0 ||
-           (stream->buffer_size - stream->skip) < stream->data_limit) {
+           (stream->buffer_size - stream->skip) < stream->data_limit)
                *size_r = stream->buffer_size - stream->pos;
-               if (stream->try_alloc_limit > 0 &&
-                   *size_r > stream->try_alloc_limit)
-                       *size_r = stream->try_alloc_limit;
-       } else {
+       else {
                size_t buffered = (stream->pos - stream->skip);
 
                if (buffered >= stream->data_limit)