From: Aki Tuomi <aki.tuomi@dovecot.fi>
Date: Thu, 25 Feb 2016 07:58:55 +0000 (+0200)
Subject: doveadm-search: Use ver2 structures
X-Git-Tag: 2.2.22.rc1~63
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c874dcb48156e0225ea13d4b66ecfbd32b4fd44d;p=thirdparty%2Fdovecot%2Fcore.git

doveadm-search: Use ver2 structures
---

diff --git a/src/doveadm/doveadm-mail-search.c b/src/doveadm/doveadm-mail-search.c
index 4e097d190c..fe5c6d2c0c 100644
--- a/src/doveadm/doveadm-mail-search.c
+++ b/src/doveadm/doveadm-mail-search.c
@@ -91,6 +91,12 @@ static struct doveadm_mail_cmd_context *cmd_search_alloc(void)
 	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
 };
diff --git a/src/doveadm/doveadm-mail.c b/src/doveadm/doveadm-mail.c
index fd0f7fd8ae..bb1bf81d8d 100644
--- a/src/doveadm/doveadm-mail.c
+++ b/src/doveadm/doveadm-mail.c
@@ -834,7 +834,6 @@ DOVEADM_CMD_PARAMS_END
 
 
 static struct doveadm_mail_cmd *mail_commands[] = {
-	&cmd_search,
 	&cmd_copy,
 	&cmd_move,
 	&cmd_batch,
@@ -866,7 +865,8 @@ static struct doveadm_cmd_ver2 *mail_commands_ver2[] = {
 	&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)
diff --git a/src/doveadm/doveadm-mail.h b/src/doveadm/doveadm-mail.h
index cb9a197b6d..5153db3a4a 100644
--- a/src/doveadm/doveadm-mail.h
+++ b/src/doveadm/doveadm-mail.h
@@ -169,8 +169,6 @@ void doveadm_mail_failed_mailbox(struct doveadm_mail_cmd_context *ctx,
 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_add_ver2;
 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) \