Mercurial > dovecot > original-hg > dovecot-1.2
changeset 1883:aa2341461620 HEAD
cleanups
| author | Timo Sirainen <tss@iki.fi> |
|---|---|
| date | Wed, 12 Nov 2003 18:21:48 +0200 |
| parents | 01a83df6c232 |
| children | 61b80f9e6d87 |
| files | src/lib/istream-file.c src/lib/istream-mmap.c |
| diffstat | 2 files changed, 6 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/src/lib/istream-file.c Tue Nov 11 18:36:59 2003 +0200 +++ b/src/lib/istream-file.c Wed Nov 12 18:21:48 2003 +0200 @@ -144,7 +144,6 @@ 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 {
--- a/src/lib/istream-mmap.c Tue Nov 11 18:36:59 2003 +0200 +++ b/src/lib/istream-mmap.c Wed Nov 12 18:21:48 2003 +0200 @@ -109,11 +109,11 @@ 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 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;