changeset 920:30babf122f97 HEAD

Minor speed optimizations
author Timo Sirainen <tss@iki.fi>
date Wed, 08 Jan 2003 20:51:46 +0200
parents 5ebec31b49e0
children b9875966b09d
files src/lib/ostream-file.c src/lib/ostream.c
diffstat 2 files changed, 4 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/src/lib/ostream-file.c	Tue Jan 07 19:45:38 2003 +0200
+++ b/src/lib/ostream-file.c	Wed Jan 08 20:51:46 2003 +0200
@@ -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,11 +333,11 @@
 	struct file_ostream *fstream = (struct file_ostream *) stream;
 	size_t unused;
 
-	if (fstream->max_buffer_size == 0)
+	unused = get_unused_space(fstream);
+	if (size <= unused)
 		return 1;
 
-	unused = get_unused_space(fstream);
-	if (size <= unused)
+	if (fstream->max_buffer_size == 0)
 		return 1;
 
 	unused += (fstream->max_buffer_size - fstream->buffer_size);
@@ -473,9 +473,6 @@
 
 	i_assert(size <= SSIZE_T_MAX);
 
-	if (stream->ostream.closed)
-		return -1;
-
 	stream->ostream.stream_errno = 0;
 
 	/* never try sending immediately if fd is blocking,
--- a/src/lib/ostream.c	Tue Jan 07 19:45:38 2003 +0200
+++ b/src/lib/ostream.c	Wed Jan 08 20:51:46 2003 +0200
@@ -99,9 +99,6 @@
 	if (stream->closed)
 		return -1;
 
-	if (size == 0)
-		return 0;
-
 	return _stream->send(_stream, data, size);
 }