From: Timo Sirainen <tss@iki.fi>
Date: Sat, 8 Jan 2011 19:03:15 +0000 (+0200)
Subject: istream-seekable: Minor code cleanup.
X-Git-Tag: 2.0.9~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5297aa3ceddf3a4ecc09f49c832bc424eff8f906;p=thirdparty%2Fdovecot%2Fcore.git

istream-seekable: Minor code cleanup.
---

diff --git a/src/lib/istream-seekable.c b/src/lib/istream-seekable.c
index f182488161..8143e6e8cc 100644
--- a/src/lib/istream-seekable.c
+++ b/src/lib/istream-seekable.c
@@ -157,8 +157,9 @@ static bool read_from_buffer(struct seekable_istream *sstream, ssize_t *ret_r)
 	const unsigned char *data;
 	size_t size, pos, offset;
 
-	if (stream->istream.v_offset +
-	    (stream->pos - stream->skip) >= sstream->buffer->used) {
+	i_assert(stream->skip == 0);
+
+	if (stream->istream.v_offset + stream->pos >= sstream->buffer->used) {
 		/* need to read more */
 		if (sstream->buffer->used >= stream->max_buffer_size)
 			return FALSE;
@@ -176,6 +177,7 @@ static bool read_from_buffer(struct seekable_istream *sstream, ssize_t *ret_r)
 
 		/* we should have more now. */
 		data = i_stream_get_data(sstream->cur_input, &size);
+		i_assert(size > 0);
 		buffer_append(sstream->buffer, data, size);
 		i_stream_skip(sstream->cur_input, size);
 	}