From: Marco Bettini Date: Wed, 1 Mar 2023 16:17:05 +0000 (+0000) Subject: fts-flatcurve: Move doveadm_print_header() eariler X-Git-Tag: 2.4.0~2944 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=040c3def88250081fd93f669184c41f1dbfa922a;p=thirdparty%2Fdovecot%2Fcore.git fts-flatcurve: Move doveadm_print_header() eariler Otherwise the newly introduced checks trigger faults --- diff --git a/src/plugins/fts-flatcurve/doveadm-fts-flatcurve.c b/src/plugins/fts-flatcurve/doveadm-fts-flatcurve.c index 4a01c60004..9f7cc959ee 100644 --- a/src/plugins/fts-flatcurve/doveadm-fts-flatcurve.c +++ b/src/plugins/fts-flatcurve/doveadm-fts-flatcurve.c @@ -157,25 +157,6 @@ cmd_fts_flatcurve_mailbox_run(struct doveadm_mail_cmd_context *_ctx, return -1; } - doveadm_print_header("mailbox", "mailbox", - DOVEADM_PRINT_HEADER_FLAG_HIDE_TITLE); - doveadm_print_header_simple("guid"); - - switch (ctx->cmd_type) { - case FTS_FLATCURVE_CMD_CHECK: - doveadm_print_header_simple("errors"); - doveadm_print_header_simple("shards"); - break; - case FTS_FLATCURVE_CMD_STATS: - doveadm_print_header_simple("last_uid"); - doveadm_print_header_simple("messages"); - doveadm_print_header_simple("shards"); - doveadm_print_header_simple("version"); - break; - default: - break; - } - struct flatcurve_fts_backend *backend = fuser->backend; int ret = cmd_fts_flatcurve_mailbox_run_do(backend, user, ctx); if (ret < 0) @@ -211,6 +192,25 @@ cmd_fts_flatcurve_mailbox_init(struct doveadm_mail_cmd_context *_ctx) } _ctx->search_args = doveadm_mail_mailbox_search_args_build(args); + + doveadm_print_header("mailbox", "mailbox", + DOVEADM_PRINT_HEADER_FLAG_HIDE_TITLE); + doveadm_print_header_simple("guid"); + + switch (ctx->cmd_type) { + case FTS_FLATCURVE_CMD_CHECK: + doveadm_print_header_simple("errors"); + doveadm_print_header_simple("shards"); + break; + case FTS_FLATCURVE_CMD_STATS: + doveadm_print_header_simple("last_uid"); + doveadm_print_header_simple("messages"); + doveadm_print_header_simple("shards"); + doveadm_print_header_simple("version"); + break; + default: + break; + } } static void