dovecot-2.0: doveadm: Moved print formatters list to doveadm.c

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.0/rev/00033e2470ec
changeset: 11892:00033e2470ec
user:      Timo Sirainen <tss at iki.fi>
date:      Fri Jul 23 15:58:14 2010 +0100
description:
doveadm: Moved print formatters list to doveadm.c

diffstat:

 src/doveadm/doveadm-print.c |  8 +-------
 src/doveadm/doveadm-print.h |  2 ++
 src/doveadm/doveadm.c       |  8 ++++++++
 3 files changed, 11 insertions(+), 7 deletions(-)

diffs (55 lines):

diff -r 19574f77a021 -r 00033e2470ec src/doveadm/doveadm-print.c
--- a/src/doveadm/doveadm-print.c	Fri Jul 23 15:55:27 2010 +0100
+++ b/src/doveadm/doveadm-print.c	Fri Jul 23 15:58:14 2010 +0100
@@ -21,12 +21,6 @@
 };
 
 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 @@
 	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 -r 19574f77a021 -r 00033e2470ec src/doveadm/doveadm-print.h
--- a/src/doveadm/doveadm-print.h	Fri Jul 23 15:55:27 2010 +0100
+++ b/src/doveadm/doveadm-print.h	Fri Jul 23 15:58:14 2010 +0100
@@ -10,6 +10,8 @@
 	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 -r 19574f77a021 -r 00033e2470ec src/doveadm/doveadm.c
--- a/src/doveadm/doveadm.c	Fri Jul 23 15:55:27 2010 +0100
+++ b/src/doveadm/doveadm.c	Fri Jul 23 15:58:14 2010 +0100
@@ -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)