From e1d08b1c39c63de92f0e914064a508bbf6c6fcc5 Mon Sep 17 00:00:00 2001 From: Aki Tuomi Date: Thu, 25 Feb 2016 09:30:41 +0200 Subject: [PATCH] doveadm-deduplicate: Use ver2 structures --- src/doveadm/doveadm-mail-deduplicate.c | 11 +++++++++-- src/doveadm/doveadm-mail.c | 4 ++-- src/doveadm/doveadm-mail.h | 2 +- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/src/doveadm/doveadm-mail-deduplicate.c b/src/doveadm/doveadm-mail-deduplicate.c index 515399f705..dab7c3716a 100644 --- a/src/doveadm/doveadm-mail-deduplicate.c +++ b/src/doveadm/doveadm-mail-deduplicate.c @@ -214,6 +214,13 @@ static struct doveadm_mail_cmd_context *cmd_deduplicate_alloc(void) return &ctx->ctx; } -struct doveadm_mail_cmd cmd_deduplicate = { - cmd_deduplicate_alloc, "deduplicate", "[-m] " +struct doveadm_cmd_ver2 doveadm_cmd_deduplicate_ver2 = { + .name = "deduplicate", + .mail_cmd = cmd_deduplicate_alloc, + .usage = DOVEADM_CMD_MAIL_USAGE_PREFIX "[-m] ", +DOVEADM_CMD_PARAMS_START +DOVEADM_CMD_MAIL_COMMON +DOVEADM_CMD_PARAM('m', "by-msgid", CMD_PARAM_BOOL, 0) +DOVEADM_CMD_PARAM('\0', "query", CMD_PARAM_ARRAY, CMD_PARAM_FLAG_POSITIONAL) +DOVEADM_CMD_PARAMS_END }; diff --git a/src/doveadm/doveadm-mail.c b/src/doveadm/doveadm-mail.c index ee155acb6e..05f22d0e7c 100644 --- a/src/doveadm/doveadm-mail.c +++ b/src/doveadm/doveadm-mail.c @@ -830,7 +830,6 @@ static struct doveadm_mail_cmd *mail_commands[] = { &cmd_flags_replace, &cmd_import, &cmd_copy, - &cmd_deduplicate, &cmd_move, &cmd_batch, &cmd_dsync_backup, @@ -853,7 +852,8 @@ static struct doveadm_cmd_ver2 *mail_commands_ver2[] = { &doveadm_cmd_fetch_ver2, &doveadm_cmd_save_ver2, &doveadm_cmd_index_ver2, - &doveadm_cmd_altmove_ver2 + &doveadm_cmd_altmove_ver2, + &doveadm_cmd_deduplicate_ver2 }; void doveadm_mail_init(void) diff --git a/src/doveadm/doveadm-mail.h b/src/doveadm/doveadm-mail.h index e6eec3ff02..30c0fdff56 100644 --- a/src/doveadm/doveadm-mail.h +++ b/src/doveadm/doveadm-mail.h @@ -176,7 +176,6 @@ extern struct doveadm_mail_cmd cmd_flags_remove; extern struct doveadm_mail_cmd cmd_flags_replace; extern struct doveadm_mail_cmd cmd_import; extern struct doveadm_mail_cmd cmd_copy; -extern struct doveadm_mail_cmd cmd_deduplicate; extern struct doveadm_mail_cmd cmd_move; extern struct doveadm_mail_cmd cmd_batch; @@ -195,6 +194,7 @@ extern struct doveadm_cmd_ver2 doveadm_cmd_fetch_ver2; extern struct doveadm_cmd_ver2 doveadm_cmd_save_ver2; extern struct doveadm_cmd_ver2 doveadm_cmd_index_ver2; extern struct doveadm_cmd_ver2 doveadm_cmd_altmove_ver2; +extern struct doveadm_cmd_ver2 doveadm_cmd_deduplicate_ver2; #define DOVEADM_CMD_MAIL_COMMON \ DOVEADM_CMD_PARAM('A', "all-users", CMD_PARAM_BOOL, 0) \