Mercurial > dovecot > core-2.2
changeset 19857:386b39769816
doveadm-search: Use ver2 structures
| author | Aki Tuomi <aki.tuomi@dovecot.fi> |
|---|---|
| date | Thu, 25 Feb 2016 09:58:55 +0200 |
| parents | d69484deeaea |
| children | 4c9fc071bc00 |
| files | src/doveadm/doveadm-mail-search.c src/doveadm/doveadm-mail.c src/doveadm/doveadm-mail.h |
| diffstat | 3 files changed, 11 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/doveadm/doveadm-mail-search.c Thu Feb 25 09:54:01 2016 +0200 +++ b/src/doveadm/doveadm-mail-search.c Thu Feb 25 09:58:55 2016 +0200 @@ -91,6 +91,12 @@ return ctx; } -struct doveadm_mail_cmd cmd_search = { - cmd_search_alloc, "search", "<search query>" +struct doveadm_cmd_ver2 doveadm_cmd_search_ver2 = { + .name = "search", + .mail_cmd = cmd_search_alloc, + .usage = DOVEADM_CMD_MAIL_USAGE_PREFIX "<search query>", +DOVEADM_CMD_PARAMS_START +DOVEADM_CMD_MAIL_COMMON +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:54:01 2016 +0200 +++ b/src/doveadm/doveadm-mail.c Thu Feb 25 09:58:55 2016 +0200 @@ -834,7 +834,6 @@ static struct doveadm_mail_cmd *mail_commands[] = { - &cmd_search, &cmd_copy, &cmd_move, &cmd_batch, @@ -866,7 +865,8 @@ &doveadm_cmd_flags_replace_ver2, &doveadm_cmd_import_ver2, &doveadm_cmd_force_resync_ver2, - &doveadm_cmd_purge_ver2 + &doveadm_cmd_purge_ver2, + &doveadm_cmd_search_ver2 }; void doveadm_mail_init(void)
--- a/src/doveadm/doveadm-mail.h Thu Feb 25 09:54:01 2016 +0200 +++ b/src/doveadm/doveadm-mail.h Thu Feb 25 09:58:55 2016 +0200 @@ -169,8 +169,6 @@ void doveadm_mail_failed_list(struct doveadm_mail_cmd_context *ctx, struct mailbox_list *list); -extern struct doveadm_mail_cmd cmd_search; -extern struct doveadm_mail_cmd cmd_import; extern struct doveadm_mail_cmd cmd_copy; extern struct doveadm_mail_cmd cmd_move; extern struct doveadm_mail_cmd cmd_batch; @@ -196,6 +194,7 @@ extern struct doveadm_cmd_ver2 doveadm_cmd_flags_remove_ver2; extern struct doveadm_cmd_ver2 doveadm_cmd_flags_replace_ver2; extern struct doveadm_cmd_ver2 doveadm_cmd_import_ver2; +extern struct doveadm_cmd_ver2 doveadm_cmd_search_ver2; #define DOVEADM_CMD_MAIL_COMMON \ DOVEADM_CMD_PARAM('A', "all-users", CMD_PARAM_BOOL, 0) \