]> git.ipfire.org Git - thirdparty/dovecot/core.git/commitdiff
doveadm-flags: Use ver2 structures
authorAki Tuomi <aki.tuomi@dovecot.fi>
Thu, 25 Feb 2016 07:44:04 +0000 (09:44 +0200)
committerTimo Sirainen <timo.sirainen@dovecot.fi>
Fri, 26 Feb 2016 12:03:26 +0000 (14:03 +0200)
src/doveadm/doveadm-mail-flags.c
src/doveadm/doveadm-mail.c
src/doveadm/doveadm-mail.h

index 11d2a313cee1f846512256a6d04bf6d2b844a283..60e631394cf1e6b483ede4322675a0850740bdbe 100644 (file)
@@ -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
 };
index 84ff4e3c2258fc8b8732eea8d9afe458d3ccfca8..3001dc0f4826a4bc48b7be5d9bcc0074c65de22a 100644 (file)
@@ -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)
index fc6958dab29a66b8307fc449e384ba2bbe9edd66..89144aff5afe634b3e54a3095fbe3e6125a63a2b 100644 (file)
@@ -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) \