Mercurial > dovecot > core-2.2
changeset 19851:d7b6a783eee2
doveadm-deduplicate: Use ver2 structures
| author | Aki Tuomi <aki.tuomi@dovecot.fi> |
|---|---|
| date | Thu, 25 Feb 2016 09:30:41 +0200 |
| parents | aae882c92d77 |
| children | 5d810000ffd3 |
| files | src/doveadm/doveadm-mail-deduplicate.c src/doveadm/doveadm-mail.c src/doveadm/doveadm-mail.h |
| diffstat | 3 files changed, 12 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/doveadm/doveadm-mail-deduplicate.c Thu Feb 25 09:20:06 2016 +0200 +++ b/src/doveadm/doveadm-mail-deduplicate.c Thu Feb 25 09:30:41 2016 +0200 @@ -214,6 +214,13 @@ return &ctx->ctx; } -struct doveadm_mail_cmd cmd_deduplicate = { - cmd_deduplicate_alloc, "deduplicate", "[-m] <search query>" +struct doveadm_cmd_ver2 doveadm_cmd_deduplicate_ver2 = { + .name = "deduplicate", + .mail_cmd = cmd_deduplicate_alloc, + .usage = DOVEADM_CMD_MAIL_USAGE_PREFIX "[-m] <search query>", +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 };
--- a/src/doveadm/doveadm-mail.c Thu Feb 25 09:20:06 2016 +0200 +++ b/src/doveadm/doveadm-mail.c Thu Feb 25 09:30:41 2016 +0200 @@ -830,7 +830,6 @@ &cmd_flags_replace, &cmd_import, &cmd_copy, - &cmd_deduplicate, &cmd_move, &cmd_batch, &cmd_dsync_backup, @@ -853,7 +852,8 @@ &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)
--- a/src/doveadm/doveadm-mail.h Thu Feb 25 09:20:06 2016 +0200 +++ b/src/doveadm/doveadm-mail.h Thu Feb 25 09:30:41 2016 +0200 @@ -176,7 +176,6 @@ 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_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) \