[dovecot-cvs] dovecot/src/lib istream.c,1.11,1.12

[cras at procontrol.fi]

Update of /home/cvs/dovecot/src/lib
In directory danu:/tmp/cvs-serv22390

Modified Files:
	istream.c 
Log Message:
cleanup



Index: istream.c
===================================================================
RCS file: /home/cvs/dovecot/src/lib/istream.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- istream.c	29 Oct 2003 12:58:35 -0000	1.11
+++ istream.c	29 Oct 2003 14:53:55 -0000	1.12
@@ -111,7 +111,8 @@
 	i_assert(stream->v_size == 0 ||
 		 stream->v_offset + count <= stream->v_size);
 
-	if (count <= _stream->pos - _stream->skip) {
+	data_size = _stream->pos - _stream->skip;
+	if (count <= data_size) {
 		stream->v_offset += count;
 		_stream->skip += count;
 		return;
@@ -120,10 +121,8 @@
 	if (stream->closed)
 		return;
 
-	data_size = _stream->pos - _stream->skip;
-	_stream->skip = _stream->pos;
-
 	count -= data_size;
+	_stream->skip = _stream->pos;
 	stream->v_offset += data_size;
 
 	if (_stream->pos < _stream->high_pos) {