Mercurial > dovecot > core-2.2

changeset 13575:a418589173c8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
imapc: Changed imapc_client_mailbox_cmd() parameter order to be same as in _cmdf().
author Timo Sirainen <tss@iki.fi>
date Sat, 01 Oct 2011 17:55:18 +0300
parents 037e963c9a34
children 967ad9ad37ff
files src/lib-imap-client/imapc-client.c src/lib-imap-client/imapc-client.h src/lib-storage/index/imapc/imapc-mail-fetch.c src/lib-storage/index/imapc/imapc-mail.c src/lib-storage/index/imapc/imapc-storage.c src/lib-storage/index/imapc/imapc-sync.c
diffstat 6 files changed, 17 insertions(+), 18 deletions(-) [+]
line wrap: on
line diff
--- a/src/lib-imap-client/imapc-client.c	Sat Oct 01 17:54:57 2011 +0300
+++ b/src/lib-imap-client/imapc-client.c	Sat Oct 01 17:55:18 2011 +0300
@@ -345,9 +345,8 @@
 }
 
 void imapc_client_mailbox_cmd(struct imapc_client_mailbox *box,
-			      const char *cmd,
 			      imapc_command_callback_t *callback,
-			      void *context)
+			      void *context, const char *cmd)
 {
 	struct imapc_client_command_context *ctx;
 	struct imapc_command_reply reply;
--- a/src/lib-imap-client/imapc-client.h	Sat Oct 01 17:54:57 2011 +0300
+++ b/src/lib-imap-client/imapc-client.h	Sat Oct 01 17:55:18 2011 +0300
@@ -133,9 +133,8 @@
 void imapc_client_mailbox_close(struct imapc_client_mailbox **box);
 void imapc_client_mailbox_disconnect(struct imapc_client_mailbox *box);
 void imapc_client_mailbox_cmd(struct imapc_client_mailbox *box,
-			      const char *cmd,
 			      imapc_command_callback_t *callback,
-			      void *context);
+			      void *context, const char *cmd);
 void imapc_client_mailbox_cmdf(struct imapc_client_mailbox *box,
 			       imapc_command_callback_t *callback,
 			       void *context, const char *cmd_fmt, ...)
--- a/src/lib-storage/index/imapc/imapc-mail-fetch.c	Sat Oct 01 17:54:57 2011 +0300
+++ b/src/lib-storage/index/imapc/imapc-mail-fetch.c	Sat Oct 01 17:55:18 2011 +0300
@@ -102,9 +102,9 @@
 	if (mail->fetch_count++ == 0)
 		array_append(&mbox->fetch_mails, &mail, 1);
 
-	imapc_client_mailbox_cmdf(mbox->client_box,
-				  imapc_mail_prefetch_callback,
-				  mail, "%1s", str_c(str));
+	imapc_client_mailbox_cmd(mbox->client_box,
+				 imapc_mail_prefetch_callback,
+				 mail, str_c(str));
 	mail->imail.data.prefetch_sent = TRUE;
 	return 0;
 }
--- a/src/lib-storage/index/imapc/imapc-mail.c	Sat Oct 01 17:54:57 2011 +0300
+++ b/src/lib-storage/index/imapc/imapc-mail.c	Sat Oct 01 17:55:18 2011 +0300
@@ -74,8 +74,8 @@
 	/* we may be running against a server that hasn't bothered sending
 	   us an EXPUNGE. see if NOOP sends it. */
 	imapc_simple_context_init(&sctx, mbox->storage);
-	imapc_client_mailbox_cmdf(mbox->client_box,
-				  imapc_simple_callback, &sctx, "NOOP");
+	imapc_client_mailbox_cmd(mbox->client_box,
+				 imapc_simple_callback, &sctx, "NOOP");
 	imapc_simple_run(&sctx);
 
 	return !imapc_msgmap_uid_to_rseq(msgmap, _mail->uid, &rseq);
--- a/src/lib-storage/index/imapc/imapc-storage.c	Sat Oct 01 17:54:57 2011 +0300
+++ b/src/lib-storage/index/imapc/imapc-storage.c	Sat Oct 01 17:55:18 2011 +0300
@@ -614,8 +614,8 @@
 
 static void imapc_idle_timeout(struct imapc_mailbox *mbox)
 {
-	imapc_client_mailbox_cmd(mbox->client_box, "NOOP",
-				 imapc_noop_callback, mbox->storage);
+	imapc_client_mailbox_cmd(mbox->client_box,
+				 imapc_noop_callback, mbox->storage, "NOOP");
 }
 
 static void imapc_idle_noop_callback(const struct imapc_command_reply *reply,
@@ -645,8 +645,9 @@
 		   don't notice changes immediately, we'll force them to check
 		   here by sending a NOOP. this helps with clients that break
 		   IDLE when clicking "get mail". */
-		imapc_client_mailbox_cmd(mbox->client_box, "NOOP",
-					 imapc_idle_noop_callback, mbox);
+		imapc_client_mailbox_cmd(mbox->client_box,
+					 imapc_idle_noop_callback, mbox,
+					 "NOOP");
 	} else {
 		/* remote server doesn't support IDLE.
 		   check for changes with NOOP every once in a while. */
--- a/src/lib-storage/index/imapc/imapc-sync.c	Sat Oct 01 17:54:57 2011 +0300
+++ b/src/lib-storage/index/imapc/imapc-sync.c	Sat Oct 01 17:55:18 2011 +0300
@@ -39,8 +39,8 @@
 static void imapc_sync_cmd(struct imapc_sync_context *ctx, const char *cmd)
 {
 	ctx->sync_command_count++;
-	imapc_client_mailbox_cmd(ctx->mbox->client_box, cmd,
-				 imapc_sync_callback, ctx);
+	imapc_client_mailbox_cmd(ctx->mbox->client_box,
+				 imapc_sync_callback, ctx, cmd);
 }
 
 static void
@@ -400,9 +400,9 @@
 	if ((capabilities & IMAPC_CAPABILITY_IDLE) == 0) {
 		/* IDLE not supported. do NOOP to get latest changes
 		   before starting sync. */
-		imapc_client_mailbox_cmdf(mbox->client_box,
-					  imapc_noop_stop_callback,
-					  mbox->storage, "NOOP");
+		imapc_client_mailbox_cmd(mbox->client_box,
+					 imapc_noop_stop_callback,
+					 mbox->storage, "NOOP");
 		imapc_storage_run(mbox->storage);
 	}