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

[cras at procontrol.fi]

Update of /home/cvs/dovecot/src/lib
In directory talvi:/tmp/cvs-serv11594/lib

Modified Files:
	istream-mmap.c 
Log Message:
minor optimization



Index: istream-mmap.c
===================================================================
RCS file: /home/cvs/dovecot/src/lib/istream-mmap.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- istream-mmap.c	27 Apr 2004 20:25:53 -0000	1.10
+++ istream-mmap.c	19 Jun 2004 20:29:08 -0000	1.11
@@ -113,19 +113,25 @@
 	i_assert((uoff_t)mstream->mmap_offset + stream->buffer_size <=
 		 mstream->v_size);
 
-	mstream->mmap_base = mmap(NULL, stream->buffer_size,
-				  PROT_READ, MAP_PRIVATE,
-				  mstream->fd, mstream->mmap_offset);
-	if (mstream->mmap_base == MAP_FAILED) {
-		stream->istream.stream_errno = errno;
+	if (stream->buffer_size == 0) {
+		/* don't bother even trying mmap */
 		mstream->mmap_base = NULL;
 		stream->buffer = NULL;
-		stream->buffer_size = 0;
-		stream->skip = stream->pos = 0;
-		i_error("mmap_istream.mmap() failed: %m");
-		return -1;
+	} else {
+		mstream->mmap_base =
+			mmap(NULL, stream->buffer_size, PROT_READ, MAP_PRIVATE,
+			     mstream->fd, mstream->mmap_offset);
+		if (mstream->mmap_base == MAP_FAILED) {
+			stream->istream.stream_errno = errno;
+			mstream->mmap_base = NULL;
+			stream->buffer = NULL;
+			stream->buffer_size = 0;
+			stream->skip = stream->pos = 0;
+			i_error("mmap_istream.mmap() failed: %m");
+			return -1;
+		}
+		stream->buffer = mstream->mmap_base;
 	}
-	stream->buffer = mstream->mmap_base;
 
 	if (stream->buffer_size > mmap_pagesize) {
 		if (madvise(mstream->mmap_base, stream->buffer_size,