dovecot-2.1: imapc: Changed imapc_client_mailbox_cmd() parameter...
dovecot at dovecot.org
dovecot at dovecot.org
Sat Oct 1 17:47:11 EEST 2011
details: http://hg.dovecot.org/dovecot-2.1/rev/a418589173c8
changeset: 13575:a418589173c8
user: Timo Sirainen <tss at iki.fi>
date: Sat Oct 01 17:55:18 2011 +0300
description:
imapc: Changed imapc_client_mailbox_cmd() parameter order to be same as in _cmdf().
diffstat:
src/lib-imap-client/imapc-client.c | 3 +--
src/lib-imap-client/imapc-client.h | 3 +--
src/lib-storage/index/imapc/imapc-mail-fetch.c | 6 +++---
src/lib-storage/index/imapc/imapc-mail.c | 4 ++--
src/lib-storage/index/imapc/imapc-storage.c | 9 +++++----
src/lib-storage/index/imapc/imapc-sync.c | 10 +++++-----
6 files changed, 17 insertions(+), 18 deletions(-)
diffs (111 lines):
diff -r 037e963c9a34 -r a418589173c8 src/lib-imap-client/imapc-client.c
--- 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;
diff -r 037e963c9a34 -r a418589173c8 src/lib-imap-client/imapc-client.h
--- 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, ...)
diff -r 037e963c9a34 -r a418589173c8 src/lib-storage/index/imapc/imapc-mail-fetch.c
--- 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;
}
diff -r 037e963c9a34 -r a418589173c8 src/lib-storage/index/imapc/imapc-mail.c
--- 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);
diff -r 037e963c9a34 -r a418589173c8 src/lib-storage/index/imapc/imapc-storage.c
--- 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. */
diff -r 037e963c9a34 -r a418589173c8 src/lib-storage/index/imapc/imapc-sync.c
--- 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);
}
More information about the dovecot-cvs
mailing list