[dovecot-cvs]
dovecot/src/lib istream-file.c,1.14,1.15 istream-mmap.c,1.8,1.9
cras at procontrol.fi
cras at procontrol.fi
Wed Nov 12 18:21:51 EET 2003
Update of /home/cvs/dovecot/src/lib
In directory danu:/tmp/cvs-serv5490
Modified Files:
istream-file.c istream-mmap.c
Log Message:
cleanups
Index: istream-file.c
===================================================================
RCS file: /home/cvs/dovecot/src/lib/istream-file.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- istream-file.c 9 Nov 2003 18:26:25 -0000 1.14
+++ istream-file.c 12 Nov 2003 16:21:48 -0000 1.15
@@ -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 {
Index: istream-mmap.c
===================================================================
RCS file: /home/cvs/dovecot/src/lib/istream-mmap.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- istream-mmap.c 9 Nov 2003 18:26:25 -0000 1.8
+++ istream-mmap.c 12 Nov 2003 16:21:48 -0000 1.9
@@ -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;
More information about the dovecot-cvs
mailing list