trace2: use designated initializers for "struct tr2_tgt"

As with the preceding commit, change another set of file-level struct
assignments to use designated initializers.

As before the "= NULL" assignments are redundant, but we're keeping
them for self-documentation purposes. The comments left to explain the
pre-image can now be removed in favor of working code that relays the
same information to the reader.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/trace2/tr2_tgt_event.c b/trace2/tr2_tgt_event.c
index bd17ecdc32162e88eb8f43c663e3f3745f08b34a..b5c63622d1e5598c02a32a01ece9c946ec6fa858 100644 (file)
--- a/trace2/tr2_tgt_event.c
+++ b/trace2/tr2_tgt_event.c
@@ -613,34 +613,34 @@ static void fn_data_json_fl(const char *file, int line,
 }
 
 struct tr2_tgt tr2_tgt_event = {
-       &tr2dst_event,
-
-       fn_init,
-       fn_term,
-
-       fn_version_fl,
-       fn_start_fl,
-       fn_exit_fl,
-       fn_signal,
-       fn_atexit,
-       fn_error_va_fl,
-       fn_command_path_fl,
-       fn_command_ancestry_fl,
-       fn_command_name_fl,
-       fn_command_mode_fl,
-       fn_alias_fl,
-       fn_child_start_fl,
-       fn_child_exit_fl,
-       fn_child_ready_fl,
-       fn_thread_start_fl,
-       fn_thread_exit_fl,
-       fn_exec_fl,
-       fn_exec_result_fl,
-       fn_param_fl,
-       fn_repo_fl,
-       fn_region_enter_printf_va_fl,
-       fn_region_leave_printf_va_fl,
-       fn_data_fl,
-       fn_data_json_fl,
-       NULL, /* printf */
+       .pdst = &tr2dst_event,
+
+       .pfn_init = fn_init,
+       .pfn_term = fn_term,
+
+       .pfn_version_fl = fn_version_fl,
+       .pfn_start_fl = fn_start_fl,
+       .pfn_exit_fl = fn_exit_fl,
+       .pfn_signal = fn_signal,
+       .pfn_atexit = fn_atexit,
+       .pfn_error_va_fl = fn_error_va_fl,
+       .pfn_command_path_fl = fn_command_path_fl,
+       .pfn_command_ancestry_fl = fn_command_ancestry_fl,
+       .pfn_command_name_fl = fn_command_name_fl,
+       .pfn_command_mode_fl = fn_command_mode_fl,
+       .pfn_alias_fl = fn_alias_fl,
+       .pfn_child_start_fl = fn_child_start_fl,
+       .pfn_child_exit_fl = fn_child_exit_fl,
+       .pfn_child_ready_fl = fn_child_ready_fl,
+       .pfn_thread_start_fl = fn_thread_start_fl,
+       .pfn_thread_exit_fl = fn_thread_exit_fl,
+       .pfn_exec_fl = fn_exec_fl,
+       .pfn_exec_result_fl = fn_exec_result_fl,
+       .pfn_param_fl = fn_param_fl,
+       .pfn_repo_fl = fn_repo_fl,
+       .pfn_region_enter_printf_va_fl = fn_region_enter_printf_va_fl,
+       .pfn_region_leave_printf_va_fl = fn_region_leave_printf_va_fl,
+       .pfn_data_fl = fn_data_fl,
+       .pfn_data_json_fl = fn_data_json_fl,
+       .pfn_printf_va_fl = NULL,
 };

diff --git a/trace2/tr2_tgt_normal.c b/trace2/tr2_tgt_normal.c
index 6e429a3fb9e6d8fefe200e24180e0f1d966cf9a1..c79926500187c4a5c0b18d775c83c47b7bed2858 100644 (file)
--- a/trace2/tr2_tgt_normal.c
+++ b/trace2/tr2_tgt_normal.c
@@ -325,34 +325,34 @@ static void fn_printf_va_fl(const char *file, int line,
 }
 
 struct tr2_tgt tr2_tgt_normal = {
-       &tr2dst_normal,
-
-       fn_init,
-       fn_term,
-
-       fn_version_fl,
-       fn_start_fl,
-       fn_exit_fl,
-       fn_signal,
-       fn_atexit,
-       fn_error_va_fl,
-       fn_command_path_fl,
-       fn_command_ancestry_fl,
-       fn_command_name_fl,
-       fn_command_mode_fl,
-       fn_alias_fl,
-       fn_child_start_fl,
-       fn_child_exit_fl,
-       fn_child_ready_fl,
-       NULL, /* thread_start */
-       NULL, /* thread_exit */
-       fn_exec_fl,
-       fn_exec_result_fl,
-       fn_param_fl,
-       fn_repo_fl,
-       NULL, /* region_enter */
-       NULL, /* region_leave */
-       NULL, /* data */
-       NULL, /* data_json */
-       fn_printf_va_fl,
+       .pdst = &tr2dst_normal,
+
+       .pfn_init = fn_init,
+       .pfn_term = fn_term,
+
+       .pfn_version_fl = fn_version_fl,
+       .pfn_start_fl = fn_start_fl,
+       .pfn_exit_fl = fn_exit_fl,
+       .pfn_signal = fn_signal,
+       .pfn_atexit = fn_atexit,
+       .pfn_error_va_fl = fn_error_va_fl,
+       .pfn_command_path_fl = fn_command_path_fl,
+       .pfn_command_ancestry_fl = fn_command_ancestry_fl,
+       .pfn_command_name_fl = fn_command_name_fl,
+       .pfn_command_mode_fl = fn_command_mode_fl,
+       .pfn_alias_fl = fn_alias_fl,
+       .pfn_child_start_fl = fn_child_start_fl,
+       .pfn_child_exit_fl = fn_child_exit_fl,
+       .pfn_child_ready_fl = fn_child_ready_fl,
+       .pfn_thread_start_fl = NULL,
+       .pfn_thread_exit_fl = NULL,
+       .pfn_exec_fl = fn_exec_fl,
+       .pfn_exec_result_fl = fn_exec_result_fl,
+       .pfn_param_fl = fn_param_fl,
+       .pfn_repo_fl = fn_repo_fl,
+       .pfn_region_enter_printf_va_fl = NULL,
+       .pfn_region_leave_printf_va_fl = NULL,
+       .pfn_data_fl = NULL,
+       .pfn_data_json_fl = NULL,
+       .pfn_printf_va_fl = fn_printf_va_fl,
 };

diff --git a/trace2/tr2_tgt_perf.c b/trace2/tr2_tgt_perf.c
index 2ff9cf708355b4f5e64a9fa802c04c93f5b81728..a2a0195e0f4cacb1fa1c612a28fb298aa3991aa0 100644 (file)
--- a/trace2/tr2_tgt_perf.c
+++ b/trace2/tr2_tgt_perf.c
@@ -549,34 +549,34 @@ static void fn_printf_va_fl(const char *file, int line,
 }
 
 struct tr2_tgt tr2_tgt_perf = {
-       &tr2dst_perf,
-
-       fn_init,
-       fn_term,
-
-       fn_version_fl,
-       fn_start_fl,
-       fn_exit_fl,
-       fn_signal,
-       fn_atexit,
-       fn_error_va_fl,
-       fn_command_path_fl,
-       fn_command_ancestry_fl,
-       fn_command_name_fl,
-       fn_command_mode_fl,
-       fn_alias_fl,
-       fn_child_start_fl,
-       fn_child_exit_fl,
-       fn_child_ready_fl,
-       fn_thread_start_fl,
-       fn_thread_exit_fl,
-       fn_exec_fl,
-       fn_exec_result_fl,
-       fn_param_fl,
-       fn_repo_fl,
-       fn_region_enter_printf_va_fl,
-       fn_region_leave_printf_va_fl,
-       fn_data_fl,
-       fn_data_json_fl,
-       fn_printf_va_fl,
+       .pdst = &tr2dst_perf,
+
+       .pfn_init = fn_init,
+       .pfn_term = fn_term,
+
+       .pfn_version_fl = fn_version_fl,
+       .pfn_start_fl = fn_start_fl,
+       .pfn_exit_fl = fn_exit_fl,
+       .pfn_signal = fn_signal,
+       .pfn_atexit = fn_atexit,
+       .pfn_error_va_fl = fn_error_va_fl,
+       .pfn_command_path_fl = fn_command_path_fl,
+       .pfn_command_ancestry_fl = fn_command_ancestry_fl,
+       .pfn_command_name_fl = fn_command_name_fl,
+       .pfn_command_mode_fl = fn_command_mode_fl,
+       .pfn_alias_fl = fn_alias_fl,
+       .pfn_child_start_fl = fn_child_start_fl,
+       .pfn_child_exit_fl = fn_child_exit_fl,
+       .pfn_child_ready_fl = fn_child_ready_fl,
+       .pfn_thread_start_fl = fn_thread_start_fl,
+       .pfn_thread_exit_fl = fn_thread_exit_fl,
+       .pfn_exec_fl = fn_exec_fl,
+       .pfn_exec_result_fl = fn_exec_result_fl,
+       .pfn_param_fl = fn_param_fl,
+       .pfn_repo_fl = fn_repo_fl,
+       .pfn_region_enter_printf_va_fl = fn_region_enter_printf_va_fl,
+       .pfn_region_leave_printf_va_fl = fn_region_leave_printf_va_fl,
+       .pfn_data_fl = fn_data_fl,
+       .pfn_data_json_fl = fn_data_json_fl,
+       .pfn_printf_va_fl = fn_printf_va_fl,
 };