# HG changeset patch
# User Timo Sirainen <tss@iki.fi>
# Date 1294513395 -7200
# Node ID 5f49aebe8120173ccfcd8a1aab410c9d2b9cb9a8
# Parent  7bdd06de6f5a2345dd2234ff9f96c6aeff4ebeda
istream-seekable: Minor code cleanup.

diff -r 7bdd06de6f5a -r 5f49aebe8120 src/lib/istream-seekable.c
--- a/src/lib/istream-seekable.c	Wed Jan 05 20:21:38 2011 +0200
+++ b/src/lib/istream-seekable.c	Sat Jan 08 21:03:15 2011 +0200
@@ -157,8 +157,9 @@
 	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 @@
 
 		/* 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);
 	}