doveadm: Moved print formatters list to doveadm.c

diff --git a/src/doveadm/doveadm-print.c b/src/doveadm/doveadm-print.c
index 0d47c27160ac0330030bde775465ca279f64b755..e8650bddfb55ed39f56a2e1012423a0d874a50bf 100644 (file)
--- 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 cf5c9a42e4212e268890f49b2b00ef98b230fbfd..c4caef02e2c2efccab174df2724fa56bfe65fe6d 100644 (file)
--- 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 584840b7de02a381a095451438eafd86040d08b7..e16a0bb7205898ce8fea38c217786fab76959c0a 100644 (file)
--- a/src/doveadm/doveadm.c
+++ b/src/doveadm/doveadm.c
@@ -15,6 +15,14 @@
 #include <stdlib.h>
 #include <unistd.h>
 
+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)