cleanups

--HG--
branch : HEAD

diff --git a/src/lib/istream-file.c b/src/lib/istream-file.c
index d6dbf213b42611a009c46efcaca354c2dbb42d43..311486351ba97c73c96c14e0223ae72aa6ed9ec2 100644 (file)
--- 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 dfb4119caa52f35fcda73f7348e8d0094b46cf2b..299e94fff2a73d6df4eabc2f2b0336a390801978 100644 (file)
--- 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;