doveadm: Add named initializers to print drivers

diff --git a/src/doveadm/doveadm-print-flow.c b/src/doveadm/doveadm-print-flow.c
index 7f4d01e042de44e2fd97da89124e983751ac9d21..32e89257ca00b663c04c722678270a3a4b5d7ee6 100644 (file)
--- a/src/doveadm/doveadm-print-flow.c
+++ b/src/doveadm/doveadm-print-flow.c
@@ -100,12 +100,12 @@ static void doveadm_print_flow_deinit(void)
 }
 
 struct doveadm_print_vfuncs doveadm_print_flow_vfuncs = {
-       "flow",
-
-       doveadm_print_flow_init,
-       doveadm_print_flow_deinit,
-       doveadm_print_flow_header,
-       doveadm_print_flow_print,
-       doveadm_print_flow_print_stream,
-       doveadm_print_flow_flush
+       .name = "flow",
+
+       .init = doveadm_print_flow_init,
+       .deinit = doveadm_print_flow_deinit,
+       .header = doveadm_print_flow_header,
+       .print = doveadm_print_flow_print,
+       .print_stream = doveadm_print_flow_print_stream,
+       .flush = doveadm_print_flow_flush,
 };

diff --git a/src/doveadm/doveadm-print-formatted.c b/src/doveadm/doveadm-print-formatted.c
index adb66106b5d981fb4d23b05ea39d42cc9d1e795a..b24d86b31f32f9361f48688c87c11550e06cfb07 100644 (file)
--- a/src/doveadm/doveadm-print-formatted.c
+++ b/src/doveadm/doveadm-print-formatted.c
@@ -81,13 +81,12 @@ static void doveadm_print_formatted_deinit(void)
 }
 
 struct doveadm_print_vfuncs doveadm_print_formatted_vfuncs = {
-       "formatted",
+       .name = "formatted",
 
-       doveadm_print_formatted_init,
-       doveadm_print_formatted_deinit,
-       doveadm_print_formatted_header,
-       doveadm_print_formatted_print,
-       NULL,
-       doveadm_print_formatted_flush
+       .init = doveadm_print_formatted_init,
+       .deinit = doveadm_print_formatted_deinit,
+       .header = doveadm_print_formatted_header,
+       .print = doveadm_print_formatted_print,
+       .flush = doveadm_print_formatted_flush,
 };
 

diff --git a/src/doveadm/doveadm-print-json.c b/src/doveadm/doveadm-print-json.c
index 7945b75951c4155d84bd0b6b1f10c290bb059a73..8416346f8d66d5fba2178fb7873e835db578d7d6 100644 (file)
--- a/src/doveadm/doveadm-print-json.c
+++ b/src/doveadm/doveadm-print-json.c
@@ -129,13 +129,13 @@ static void doveadm_print_json_deinit(void)
 }
 
 struct doveadm_print_vfuncs doveadm_print_json_vfuncs = {
-       "json",
-
-       doveadm_print_json_init,
-       doveadm_print_json_deinit,
-       doveadm_print_json_header,
-       doveadm_print_json_print,
-       doveadm_print_json_print_stream,
-       doveadm_print_json_flush
+       .name = "json",
+
+       .init = doveadm_print_json_init,
+       .deinit = doveadm_print_json_deinit,
+       .header = doveadm_print_json_header,
+       .print = doveadm_print_json_print,
+       .print_stream = doveadm_print_json_print_stream,
+       .flush = doveadm_print_json_flush,
 };
 

diff --git a/src/doveadm/doveadm-print-pager.c b/src/doveadm/doveadm-print-pager.c
index 3e14383520dc94fe08110f952b938dad72c131f1..00b70788348ac669b2559f52e8bcc84f8183fbe9 100644 (file)
--- a/src/doveadm/doveadm-print-pager.c
+++ b/src/doveadm/doveadm-print-pager.c
@@ -102,12 +102,12 @@ static void doveadm_print_pager_deinit(void)
 }
 
 struct doveadm_print_vfuncs doveadm_print_pager_vfuncs = {
-       DOVEADM_PRINT_TYPE_PAGER,
-
-       doveadm_print_pager_init,
-       doveadm_print_pager_deinit,
-       doveadm_print_pager_header,
-       doveadm_print_pager_print,
-       doveadm_print_pager_print_stream,
-       doveadm_print_pager_flush
+       .name = DOVEADM_PRINT_TYPE_PAGER,
+
+       .init = doveadm_print_pager_init,
+       .deinit = doveadm_print_pager_deinit,
+       .header = doveadm_print_pager_header,
+       .print = doveadm_print_pager_print,
+       .print_stream = doveadm_print_pager_print_stream,
+       .flush = doveadm_print_pager_flush,
 };

diff --git a/src/doveadm/doveadm-print-server.c b/src/doveadm/doveadm-print-server.c
index 93c6ed92538bf891565a293e02d7d2352c8632b7..86b4ae805f36495c5b3c9e9043e59bb53f2d08ce 100644 (file)
--- a/src/doveadm/doveadm-print-server.c
+++ b/src/doveadm/doveadm-print-server.c
@@ -108,12 +108,12 @@ static void doveadm_print_server_flush(void)
 }
 
 struct doveadm_print_vfuncs doveadm_print_server_vfuncs = {
-       DOVEADM_PRINT_TYPE_SERVER,
-
-       doveadm_print_server_init,
-       doveadm_print_server_deinit,
-       doveadm_print_server_header,
-       doveadm_print_server_print,
-       doveadm_print_server_print_stream,
-       doveadm_print_server_flush
+       .name = DOVEADM_PRINT_TYPE_SERVER,
+
+       .init = doveadm_print_server_init,
+       .deinit = doveadm_print_server_deinit,
+       .header = doveadm_print_server_header,
+       .print = doveadm_print_server_print,
+       .print_stream = doveadm_print_server_print_stream,
+       .flush = doveadm_print_server_flush,
 };

diff --git a/src/doveadm/doveadm-print-tab.c b/src/doveadm/doveadm-print-tab.c
index c5871eca7976dd449bd8bb9c077f4c3a2de7f441..f3a616bcc46a7f756af9d4ddbe4e26771a4b2cb6 100644 (file)
--- a/src/doveadm/doveadm-print-tab.c
+++ b/src/doveadm/doveadm-print-tab.c
@@ -65,12 +65,10 @@ static void doveadm_print_tab_flush(void)
 }
 
 struct doveadm_print_vfuncs doveadm_print_tab_vfuncs = {
-       "tab",
+       .name = "tab",
 
-       NULL,
-       NULL,
-       doveadm_print_tab_header,
-       doveadm_print_tab_print,
-       doveadm_print_tab_print_stream,
-       doveadm_print_tab_flush
+       .header = doveadm_print_tab_header,
+       .print = doveadm_print_tab_print,
+       .print_stream = doveadm_print_tab_print_stream,
+       .flush = doveadm_print_tab_flush,
 };

diff --git a/src/doveadm/doveadm-print-table.c b/src/doveadm/doveadm-print-table.c
index 25a4441564fc7c7f94335fc08b0b054dd3589951..a666e6f49d54965615ee1c14398431a5f949d0f9 100644 (file)
--- a/src/doveadm/doveadm-print-table.c
+++ b/src/doveadm/doveadm-print-table.c
@@ -257,12 +257,12 @@ static void doveadm_print_table_deinit(void)
 }
 
 struct doveadm_print_vfuncs doveadm_print_table_vfuncs = {
-       "table",
-
-       doveadm_print_table_init,
-       doveadm_print_table_deinit,
-       doveadm_print_table_header,
-       doveadm_print_table_print,
-       doveadm_print_table_print_stream,
-       doveadm_print_table_flush
+       .name = "table",
+
+       .init = doveadm_print_table_init,
+       .deinit = doveadm_print_table_deinit,
+       .header = doveadm_print_table_header,
+       .print = doveadm_print_table_print,
+       .print_stream = doveadm_print_table_print_stream,
+       .flush = doveadm_print_table_flush,
 };