From 8aa6fe58b1832da498b49de4383f9f1ef458945d Mon Sep 17 00:00:00 2001 From: Timo Sirainen Date: Fri, 23 Jul 2010 15:58:14 +0100 Subject: [PATCH] doveadm: Moved print formatters list to doveadm.c --- src/doveadm/doveadm-print.c | 8 +------- src/doveadm/doveadm-print.h | 2 ++ src/doveadm/doveadm.c | 8 ++++++++ 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/doveadm/doveadm-print.c b/src/doveadm/doveadm-print.c index 0d47c27160..e8650bddfb 100644 --- a/src/doveadm/doveadm-print.c +++ b/src/doveadm/doveadm-print.c @@ -21,12 +21,6 @@ struct doveadm_print_context { }; static struct doveadm_print_context *ctx; -static const struct doveadm_print_vfuncs *doveadm_print_vfuncs_all[] = { - &doveadm_print_flow_vfuncs, - &doveadm_print_tab_vfuncs, - &doveadm_print_table_vfuncs, - &doveadm_print_pager_vfuncs -}; bool doveadm_print_is_initialized(void) { @@ -132,7 +126,7 @@ void doveadm_print_init(const char *name) ctx->pool = pool; p_array_init(&ctx->headers, pool, 16); - for (i = 0; i < N_ELEMENTS(doveadm_print_vfuncs_all); i++) { + for (i = 0; doveadm_print_vfuncs_all[i] != NULL; i++) { if (strcmp(doveadm_print_vfuncs_all[i]->name, name) == 0) { ctx->v = doveadm_print_vfuncs_all[i]; break; diff --git a/src/doveadm/doveadm-print.h b/src/doveadm/doveadm-print.h index cf5c9a42e4..c4caef02e2 100644 --- a/src/doveadm/doveadm-print.h +++ b/src/doveadm/doveadm-print.h @@ -10,6 +10,8 @@ enum doveadm_print_header_flags { DOVEADM_PRINT_HEADER_FLAG_HIDE_TITLE = 0x04 }; +extern const struct doveadm_print_vfuncs *doveadm_print_vfuncs_all[]; + bool doveadm_print_is_initialized(void); void doveadm_print_header(const char *key, const char *title, diff --git a/src/doveadm/doveadm.c b/src/doveadm/doveadm.c index 584840b7de..e16a0bb720 100644 --- a/src/doveadm/doveadm.c +++ b/src/doveadm/doveadm.c @@ -15,6 +15,14 @@ #include #include +const struct doveadm_print_vfuncs *doveadm_print_vfuncs_all[] = { + &doveadm_print_flow_vfuncs, + &doveadm_print_tab_vfuncs, + &doveadm_print_table_vfuncs, + &doveadm_print_pager_vfuncs, + NULL +}; + static ARRAY_DEFINE(doveadm_cmds, struct doveadm_cmd); void doveadm_register_cmd(const struct doveadm_cmd *cmd) -- 2.47.3