doveadm-purge: Use ver2 structures

dovecot · Feb 26, 2016 · 949c397 · 949c397
1 parent f2c25ca
commit 949c397
Showing 1 changed file with 12 additions and 5 deletions.
diff --git a/src/doveadm/doveadm-mail.c b/src/doveadm/doveadm-mail.c
@@ -813,9 +813,6 @@ void doveadm_mail_help_name(const char *cmd_name)
 	i_fatal("Missing help for command %s", cmd_name);
 }
 
-static struct doveadm_mail_cmd cmd_purge = {
-	cmd_purge_alloc, "purge", NULL
-
 static struct doveadm_cmd_ver2 doveadm_cmd_force_resync_ver2 = {
 	.name = "force-resync",
 	.mail_cmd = cmd_force_resync_alloc,
@@ -826,8 +823,17 @@ DOVEADM_CMD_PARAM('\0', "mask", CMD_PARAM_STR, CMD_PARAM_FLAG_POSITIONAL)
 DOVEADM_CMD_PARAMS_END
 };
 
+static struct doveadm_cmd_ver2 doveadm_cmd_purge_ver2 = {
+	.name = "purge",
+	.mail_cmd = cmd_purge_alloc,
+	.usage = DOVEADM_CMD_MAIL_USAGE_PREFIX,
+DOVEADM_CMD_PARAMS_START
+DOVEADM_CMD_MAIL_COMMON
+DOVEADM_CMD_PARAMS_END
+};
+
+
 static struct doveadm_mail_cmd *mail_commands[] = {
-	&cmd_purge,
 	&cmd_search,
 	&cmd_copy,
 	&cmd_move,
@@ -859,7 +865,8 @@ static struct doveadm_cmd_ver2 *mail_commands_ver2[] = {
 	&doveadm_cmd_flags_remove_ver2,
 	&doveadm_cmd_flags_replace_ver2,
 	&doveadm_cmd_import_ver2,
-	&doveadm_cmd_force_resync_ver2
+	&doveadm_cmd_force_resync_ver2,
+	&doveadm_cmd_purge_ver2
 };
 
 void doveadm_mail_init(void)