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

doveadm-flags: Use ver2 structures
---

diff --git a/src/doveadm/doveadm-mail-flags.c b/src/doveadm/doveadm-mail-flags.c
index 11d2a313ce..60e631394c 100644
--- a/src/doveadm/doveadm-mail-flags.c
+++ b/src/doveadm/doveadm-mail-flags.c
@@ -141,12 +141,35 @@ static struct doveadm_mail_cmd_context *cmd_flags_replace_alloc(void)
 	return cmd_flag_alloc(MODIFY_REPLACE);
 }
 
-struct doveadm_mail_cmd cmd_flags_add = {
-	cmd_flags_add_alloc, "flags add", "<flags> <search query>"
+struct doveadm_cmd_ver2 doveadm_cmd_flags_add_ver2 = {
+	.name = "flags add",
+	.mail_cmd = cmd_flags_add_alloc,
+	.usage = DOVEADM_CMD_MAIL_USAGE_PREFIX "<flags> <search query>",
+DOVEADM_CMD_PARAMS_START
+DOVEADM_CMD_MAIL_COMMON
+DOVEADM_CMD_PARAM('\0', "flags", CMD_PARAM_STR, CMD_PARAM_FLAG_POSITIONAL)
+DOVEADM_CMD_PARAM('\0', "query", CMD_PARAM_ARRAY, CMD_PARAM_FLAG_POSITIONAL)
+DOVEADM_CMD_PARAMS_END
 };
-struct doveadm_mail_cmd cmd_flags_remove = {
-	cmd_flags_remove_alloc, "flags remove", "<flags> <search query>"
+
+struct doveadm_cmd_ver2 doveadm_cmd_flags_remove_ver2 = {
+	.name = "flags remove",
+	.mail_cmd = cmd_flags_remove_alloc,
+	.usage = DOVEADM_CMD_MAIL_USAGE_PREFIX "<flags> <search query>",
+DOVEADM_CMD_PARAMS_START
+DOVEADM_CMD_MAIL_COMMON
+DOVEADM_CMD_PARAM('\0', "flags", CMD_PARAM_STR, CMD_PARAM_FLAG_POSITIONAL)
+DOVEADM_CMD_PARAM('\0', "query", CMD_PARAM_ARRAY, CMD_PARAM_FLAG_POSITIONAL)
+DOVEADM_CMD_PARAMS_END
 };
-struct doveadm_mail_cmd cmd_flags_replace = {
-	cmd_flags_replace_alloc, "flags replace", "<flags> <search query>"
+
+struct doveadm_cmd_ver2 doveadm_cmd_flags_replace_ver2 = {
+	.name = "flags replace",
+	.mail_cmd = cmd_flags_replace_alloc,
+	.usage = DOVEADM_CMD_MAIL_USAGE_PREFIX "<flags> <search query>",
+DOVEADM_CMD_PARAMS_START
+DOVEADM_CMD_MAIL_COMMON
+DOVEADM_CMD_PARAM('\0', "flags", CMD_PARAM_STR, CMD_PARAM_FLAG_POSITIONAL)
+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 84ff4e3c22..3001dc0f48 100644
--- a/src/doveadm/doveadm-mail.c
+++ b/src/doveadm/doveadm-mail.c
@@ -824,9 +824,6 @@ static struct doveadm_mail_cmd *mail_commands[] = {
 	&cmd_force_resync,
 	&cmd_purge,
 	&cmd_search,
-	&cmd_flags_add,
-	&cmd_flags_remove,
-	&cmd_flags_replace,
 	&cmd_import,
 	&cmd_copy,
 	&cmd_move,
@@ -853,7 +850,10 @@ static struct doveadm_cmd_ver2 *mail_commands_ver2[] = {
 	&doveadm_cmd_index_ver2,
 	&doveadm_cmd_altmove_ver2,
 	&doveadm_cmd_deduplicate_ver2,
-	&doveadm_cmd_expunge_ver2
+	&doveadm_cmd_expunge_ver2,
+	&doveadm_cmd_flags_add_ver2,
+	&doveadm_cmd_flags_remove_ver2,
+	&doveadm_cmd_flags_replace_ver2
 };
 
 void doveadm_mail_init(void)
diff --git a/src/doveadm/doveadm-mail.h b/src/doveadm/doveadm-mail.h
index fc6958dab2..89144aff5a 100644
--- a/src/doveadm/doveadm-mail.h
+++ b/src/doveadm/doveadm-mail.h
@@ -170,9 +170,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_flags_add;
-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_move;
@@ -195,6 +192,9 @@ 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;
 extern struct doveadm_cmd_ver2 doveadm_cmd_expunge_ver2;
+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;
 
 #define DOVEADM_CMD_MAIL_COMMON \
 DOVEADM_CMD_PARAM('A', "all-users", CMD_PARAM_BOOL, 0) \