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

doveadm-fts: Use ver2 structures
---

diff --git a/src/plugins/fts/doveadm-fts.c b/src/plugins/fts/doveadm-fts.c
index f1e5478f8c..cbae77ec0b 100644
--- a/src/plugins/fts/doveadm-fts.c
+++ b/src/plugins/fts/doveadm-fts.c
@@ -259,11 +259,43 @@ cmd_fts_rescan_alloc(void)
 	return ctx;
 }
 
-static struct doveadm_mail_cmd fts_commands[] = {
-	{ cmd_fts_lookup_alloc, "fts lookup", "<search query>" },
-	{ cmd_fts_expand_alloc, "fts expand", "<search query>" },
-	{ cmd_fts_optimize_alloc, "fts optimize", "[<namespace>]" },
-	{ cmd_fts_rescan_alloc, "fts rescan", "[<namespace>]" }
+static struct doveadm_cmd_ver2 fts_commands[] = {
+{
+	.name = "fts lookup",
+	.mail_cmd = cmd_fts_lookup_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
+},
+{
+	.name = "fts expand",
+	.mail_cmd = cmd_fts_expand_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
+},
+{
+	.name = "fts optimize",
+	.mail_cmd = cmd_fts_optimize_alloc,
+	.usage = DOVEADM_CMD_MAIL_USAGE_PREFIX "[<namespace>]",
+DOVEADM_CMD_PARAMS_START
+DOVEADM_CMD_MAIL_COMMON
+DOVEADM_CMD_PARAM('\0', "namespace", CMD_PARAM_STR, CMD_PARAM_FLAG_POSITIONAL)
+DOVEADM_CMD_PARAMS_END
+},
+{
+	.name = "fts rescan",
+	.mail_cmd = cmd_fts_rescan_alloc,
+	.usage = DOVEADM_CMD_MAIL_USAGE_PREFIX "[<namespace>]",
+DOVEADM_CMD_PARAMS_START
+DOVEADM_CMD_MAIL_COMMON
+DOVEADM_CMD_PARAM('\0', "namespace", CMD_PARAM_STR, CMD_PARAM_FLAG_POSITIONAL)
+DOVEADM_CMD_PARAMS_END
+},
 };
 
 void doveadm_fts_plugin_init(struct module *module ATTR_UNUSED)
@@ -271,7 +303,7 @@ void doveadm_fts_plugin_init(struct module *module ATTR_UNUSED)
 	unsigned int i;
 
 	for (i = 0; i < N_ELEMENTS(fts_commands); i++)
-		doveadm_mail_register_cmd(&fts_commands[i]);
+		doveadm_cmd_register_ver2(&fts_commands[i]);
 	doveadm_dump_fts_expunge_log_init();
 }