From: Timo Sirainen <tss@iki.fi>
Date: Wed, 12 Nov 2003 16:21:48 +0000 (+0200)
Subject: cleanups
X-Git-Tag: 1.1.alpha1~4223
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b3142c8e513bc78da821fa70f479016148fa95e5;p=thirdparty%2Fdovecot%2Fcore.git

cleanups

--HG--
branch : HEAD
---

diff --git a/src/lib/istream-file.c b/src/lib/istream-file.c
index d6dbf213b4..311486351b 100644
--- a/src/lib/istream-file.c
+++ b/src/lib/istream-file.c
@@ -144,7 +144,6 @@ static ssize_t _read(struct _istream *stream)
 		if (fstream->file) {
 			ret = pread(stream->fd,
 				    stream->w_buffer + stream->pos, size,
-				    stream->abs_start_offset +
 				    stream->istream.v_offset +
 				    (stream->pos - stream->skip));
 		} else {
diff --git a/src/lib/istream-mmap.c b/src/lib/istream-mmap.c
index dfb4119caa..299e94fff2 100644
--- a/src/lib/istream-mmap.c
+++ b/src/lib/istream-mmap.c
@@ -109,11 +109,11 @@ static ssize_t _read(struct _istream *stream)
 			i_error("io_stream_read_mmaped(): munmap() failed: %m");
 	}
 
-	top = stream->abs_start_offset + mstream->v_size - mstream->mmap_offset;
+	top = mstream->v_size - mstream->mmap_offset;
 	stream->buffer_size = I_MIN(top, mstream->mmap_block_size);
 
 	i_assert((uoff_t)mstream->mmap_offset + stream->buffer_size <=
-		 stream->abs_start_offset + mstream->v_size);
+		 mstream->v_size);
 
 	mstream->mmap_base = mmap(NULL, stream->buffer_size,
 				  PROT_READ, MAP_PRIVATE,
@@ -142,18 +142,16 @@ static ssize_t _read(struct _istream *stream)
 static void _seek(struct _istream *stream, uoff_t v_offset)
 {
 	struct mmap_istream *mstream = (struct mmap_istream *) stream;
-	uoff_t abs_offset;
 
-	abs_offset = stream->abs_start_offset + v_offset;
 	if (stream->buffer_size != 0 &&
-	    (uoff_t)mstream->mmap_offset <= abs_offset &&
-	    (uoff_t)mstream->mmap_offset + stream->buffer_size > abs_offset) {
+	    (uoff_t)mstream->mmap_offset <= v_offset &&
+	    (uoff_t)mstream->mmap_offset + stream->buffer_size > v_offset) {
 		/* already mmaped */
-		stream->skip = stream->pos = abs_offset - mstream->mmap_offset;
+		stream->skip = stream->pos = v_offset - mstream->mmap_offset;
 	} else {
 		/* force reading next time */
 		i_stream_munmap(mstream);
-		stream->skip = stream->pos = abs_offset;
+		stream->skip = stream->pos = v_offset;
 	}
 
 	stream->istream.v_offset = v_offset;