[dovecot-cvs] dovecot/src/pop3 client.c,1.53,1.54

[cras at dovecot.org]

Update of /var/lib/cvs/dovecot/src/pop3
In directory talvi:/tmp/cvs-serv24044

Modified Files:
	client.c 
Log Message:
Code cleanup. Removed useless previous "fix".



Index: client.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/pop3/client.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- client.c	14 May 2005 20:32:08 -0000	1.53
+++ client.c	23 May 2005 22:40:39 -0000	1.54
@@ -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;
 }