[dovecot-cvs] dovecot/src/lib ostream-file.c,1.3,1.4 ostream.c,1.3,1.4

[cras at procontrol.fi]

Update of /home/cvs/dovecot/src/lib
In directory danu:/tmp/cvs-serv25225

Modified Files:
	ostream-file.c ostream.c 
Log Message:
Minor speed optimizations



Index: ostream-file.c
===================================================================
RCS file: /home/cvs/dovecot/src/lib/ostream-file.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ostream-file.c	5 Jan 2003 13:09:51 -0000	1.3
+++ ostream-file.c	8 Jan 2003 18:51:46 -0000	1.4
@@ -41,7 +41,7 @@
 #define O_STREAM_MIN_SIZE 4096
 
 #define IS_STREAM_EMPTY(fstream) \
-	(!(fstream)->full && (fstream)->head == (fstream)->tail)
+	((fstream)->head == (fstream)->tail && !(fstream)->full)
 
 #define MAX_SSIZE_T(size) \
 	((size) < SSIZE_T_MAX ? (size_t)(size) : SSIZE_T_MAX)
@@ -333,13 +333,13 @@
 	struct file_ostream *fstream = (struct file_ostream *) stream;
 	size_t unused;
 
-	if (fstream->max_buffer_size == 0)
-		return 1;
-
 	unused = get_unused_space(fstream);
 	if (size <= unused)
 		return 1;
 
+	if (fstream->max_buffer_size == 0)
+		return 1;
+
 	unused += (fstream->max_buffer_size - fstream->buffer_size);
 	return size <= unused ? 1 : 0;
 }
@@ -472,9 +472,6 @@
 	ssize_t ret;
 
 	i_assert(size <= SSIZE_T_MAX);
-
-	if (stream->ostream.closed)
-		return -1;
 
 	stream->ostream.stream_errno = 0;
 

Index: ostream.c
===================================================================
RCS file: /home/cvs/dovecot/src/lib/ostream.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ostream.c	5 Jan 2003 13:09:51 -0000	1.3
+++ ostream.c	8 Jan 2003 18:51:46 -0000	1.4
@@ -99,9 +99,6 @@
 	if (stream->closed)
 		return -1;
 
-	if (size == 0)
-		return 0;
-
 	return _stream->send(_stream, data, size);
 }