changeset 3391:d01de9d362c1 HEAD

Code cleanup. Removed useless previous "fix".
author Timo Sirainen <tss@iki.fi>
date Tue, 24 May 2005 01:40:39 +0300
parents 0a4769c38183
children e8c0736ec5be
files src/pop3/client.c
diffstat 1 files changed, 10 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/src/pop3/client.c	Mon May 23 23:50:18 2005 +0300
+++ b/src/pop3/client.c	Tue May 24 01:40:39 2005 +0300
@@ -383,24 +383,21 @@
 	client->last_output = ioloop_time;
 
 	o_stream_cork(client->output);
-	if (client->cmd != NULL) {
+	if (client->cmd != NULL)
 		client->cmd(client);
-		if (client->cmd != NULL)
-			o_stream_set_flush_pending(client->output, TRUE);
-	}
 	o_stream_uncork(client->output);
 
-	if (o_stream_get_buffer_used_size(client->output) <
-	    OUTBUF_THROTTLE_SIZE/2 && client->io == NULL &&
-	    client->cmd == NULL) {
-		/* enable input again */
-		client->io = io_add(i_stream_get_fd(client->input), IO_READ,
-				    client_input, client);
+	if (client->cmd == NULL) {
+		if (o_stream_get_buffer_used_size(client->output) <
+		    OUTBUF_THROTTLE_SIZE/2 && client->io == NULL) {
+			/* enable input again */
+			client->io = io_add(i_stream_get_fd(client->input),
+					    IO_READ, client_input, client);
+		}
+		if (client->io != NULL && client->waiting_input)
+			client_input(client);
 	}
 
-	if (client->cmd == NULL && client->io != NULL && client->waiting_input)
-		client_input(client);
-
 	return client->cmd == NULL;
 }