Mercurial > dovecot > core-2.2

changeset 12688:5f49aebe8120

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
istream-seekable: Minor code cleanup.
author Timo Sirainen <tss@iki.fi>
date Sat, 08 Jan 2011 21:03:15 +0200
parents 7bdd06de6f5a
children 73a889098495
files src/lib/istream-seekable.c
diffstat 1 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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);
 	}