dovecot-2.1: imapc: Removed unused "stop now" functionality.

dovecot at dovecot.org dovecot at dovecot.org
Fri Oct 7 20:26:35 EEST 2011


details:   http://hg.dovecot.org/dovecot-2.1/rev/4f305d785bc7
changeset: 13615:4f305d785bc7
user:      Timo Sirainen <tss at iki.fi>
date:      Fri Oct 07 20:34:53 2011 +0300
description:
imapc: Removed unused "stop now" functionality.

diffstat:

 src/lib-imap-client/imapc-client-private.h |   2 --
 src/lib-imap-client/imapc-client.c         |  11 -----------
 src/lib-imap-client/imapc-client.h         |   3 ---
 src/lib-imap-client/imapc-connection.c     |   2 +-
 4 files changed, 1 insertions(+), 17 deletions(-)

diffs (74 lines):

diff -r c358b13e32cc -r 4f305d785bc7 src/lib-imap-client/imapc-client-private.h
--- a/src/lib-imap-client/imapc-client-private.h	Fri Oct 07 20:31:57 2011 +0300
+++ b/src/lib-imap-client/imapc-client-private.h	Fri Oct 07 20:34:53 2011 +0300
@@ -21,8 +21,6 @@
 	ARRAY_DEFINE(conns, struct imapc_client_connection *);
 
 	struct ioloop *ioloop;
-
-	unsigned int stop_now:1;
 };
 
 struct imapc_client_mailbox {
diff -r c358b13e32cc -r 4f305d785bc7 src/lib-imap-client/imapc-client.c
--- a/src/lib-imap-client/imapc-client.c	Fri Oct 07 20:31:57 2011 +0300
+++ b/src/lib-imap-client/imapc-client.c	Fri Oct 07 20:34:53 2011 +0300
@@ -122,20 +122,15 @@
 {
 	struct imapc_client_connection *const *connp;
 	struct ioloop *prev_ioloop = current_ioloop;
-	bool handle_pending = client->stop_now;
 
 	i_assert(client->ioloop == NULL);
 
-	client->stop_now = FALSE;
-
 	client->ioloop = io_loop_create();
 	io_loop_set_running(client->ioloop);
 
 	array_foreach(&client->conns, connp) {
 		imapc_connection_ioloop_changed((*connp)->conn);
 		imapc_connection_connect((*connp)->conn, NULL, NULL);
-		if (handle_pending)
-			imapc_connection_input_pending((*connp)->conn);
 	}
 
 	if (io_loop_is_running(client->ioloop))
@@ -167,12 +162,6 @@
 	return client->ioloop != NULL;
 }
 
-void imapc_client_stop_now(struct imapc_client *client)
-{
-	client->stop_now = TRUE;
-	imapc_client_stop(client);
-}
-
 static struct imapc_client_connection *
 imapc_client_add_connection(struct imapc_client *client)
 {
diff -r c358b13e32cc -r 4f305d785bc7 src/lib-imap-client/imapc-client.h
--- a/src/lib-imap-client/imapc-client.h	Fri Oct 07 20:31:57 2011 +0300
+++ b/src/lib-imap-client/imapc-client.h	Fri Oct 07 20:34:53 2011 +0300
@@ -132,9 +132,6 @@
 void imapc_client_run_pre(struct imapc_client *client);
 void imapc_client_run_post(struct imapc_client *client);
 void imapc_client_stop(struct imapc_client *client);
-/* Stop immediately, don't finish even any already read pending replies.
-   They'll be finished when imapc_client_run() is again called. */
-void imapc_client_stop_now(struct imapc_client *client);
 bool imapc_client_is_running(struct imapc_client *client);
 
 struct imapc_client_mailbox *
diff -r c358b13e32cc -r 4f305d785bc7 src/lib-imap-client/imapc-connection.c
--- a/src/lib-imap-client/imapc-connection.c	Fri Oct 07 20:31:57 2011 +0300
+++ b/src/lib-imap-client/imapc-connection.c	Fri Oct 07 20:34:53 2011 +0300
@@ -1294,7 +1294,7 @@
 		timeout_reset(conn->to);
 
 	o_stream_cork(conn->output);
-	while (ret > 0 && !conn->client->stop_now && conn->input != NULL) {
+	while (ret > 0 && conn->input != NULL) {
 		T_BEGIN {
 			ret = imapc_connection_input_one(conn);
 		} T_END;


More information about the dovecot-cvs mailing list