--- tests/data/example-code.c | 124 +++++++++++++++++++--------------------- tests/data/small-code-core.c | 6 +- tests/data/small-code.c | 6 +- tests/data/small-private-code.c | 6 +- 4 files changed, 67 insertions(+), 75 deletions(-)
diff --git a/tests/data/example-code.c b/tests/data/example-code.c index 4a41b8b..2e1f73b 100644 --- a/tests/data/example-code.c +++ b/tests/data/example-code.c @@ -157,9 +157,9 @@ static const struct wl_message wl_display_events[] = { }; WL_EXPORT const struct wl_interface wl_display_interface = { - "wl_display", 1, - 2, wl_display_requests, - 2, wl_display_events, + .name = "wl_display", .version = 1, + .method_count = 2, .methods = wl_display_requests, + .event_count = 2, .events = wl_display_events, }; static const struct wl_message wl_registry_requests[] = { @@ -172,9 +172,9 @@ static const struct wl_message wl_registry_events[] = { }; WL_EXPORT const struct wl_interface wl_registry_interface = { - "wl_registry", 1, - 1, wl_registry_requests, - 2, wl_registry_events, + .name = "wl_registry", .version = 1, + .method_count = 1, .methods = wl_registry_requests, + .event_count = 2, .events = wl_registry_events, }; static const struct wl_message wl_callback_events[] = { @@ -182,9 +182,8 @@ static const struct wl_message wl_callback_events[] = { }; WL_EXPORT const struct wl_interface wl_callback_interface = { - "wl_callback", 1, - 0, NULL, - 1, wl_callback_events, + .name = "wl_callback", .version = 1, + .event_count = 1, .events = wl_callback_events, }; static const struct wl_message wl_compositor_requests[] = { @@ -193,9 +192,8 @@ static const struct wl_message wl_compositor_requests[] = { }; WL_EXPORT const struct wl_interface wl_compositor_interface = { - "wl_compositor", 4, - 2, wl_compositor_requests, - 0, NULL, + .name = "wl_compositor", .version = 4, + .method_count = 2, .methods = wl_compositor_requests, }; static const struct wl_message wl_shm_pool_requests[] = { @@ -205,9 +203,8 @@ static const struct wl_message wl_shm_pool_requests[] = { }; WL_EXPORT const struct wl_interface wl_shm_pool_interface = { - "wl_shm_pool", 1, - 3, wl_shm_pool_requests, - 0, NULL, + .name = "wl_shm_pool", .version = 1, + .method_count = 3, .methods = wl_shm_pool_requests, }; static const struct wl_message wl_shm_requests[] = { @@ -219,9 +216,9 @@ static const struct wl_message wl_shm_events[] = { }; WL_EXPORT const struct wl_interface wl_shm_interface = { - "wl_shm", 1, - 1, wl_shm_requests, - 1, wl_shm_events, + .name = "wl_shm", .version = 1, + .method_count = 1, .methods = wl_shm_requests, + .event_count = 1, .events = wl_shm_events, }; static const struct wl_message wl_buffer_requests[] = { @@ -233,9 +230,9 @@ static const struct wl_message wl_buffer_events[] = { }; WL_EXPORT const struct wl_interface wl_buffer_interface = { - "wl_buffer", 1, - 1, wl_buffer_requests, - 1, wl_buffer_events, + .name = "wl_buffer", .version = 1, + .method_count = 1, .methods = wl_buffer_requests, + .event_count = 1, .events = wl_buffer_events, }; static const struct wl_message wl_data_offer_requests[] = { @@ -253,9 +250,9 @@ static const struct wl_message wl_data_offer_events[] = { }; WL_EXPORT const struct wl_interface wl_data_offer_interface = { - "wl_data_offer", 3, - 5, wl_data_offer_requests, - 3, wl_data_offer_events, + .name = "wl_data_offer", .version = 3, + .method_count = 5, .methods = wl_data_offer_requests, + .event_count = 3, .events = wl_data_offer_events, }; static const struct wl_message wl_data_source_requests[] = { @@ -274,9 +271,9 @@ static const struct wl_message wl_data_source_events[] = { }; WL_EXPORT const struct wl_interface wl_data_source_interface = { - "wl_data_source", 3, - 3, wl_data_source_requests, - 6, wl_data_source_events, + .name = "wl_data_source", .version = 3, + .method_count = 3, .methods = wl_data_source_requests, + .event_count = 6, .events = wl_data_source_events, }; static const struct wl_message wl_data_device_requests[] = { @@ -295,9 +292,9 @@ static const struct wl_message wl_data_device_events[] = { }; WL_EXPORT const struct wl_interface wl_data_device_interface = { - "wl_data_device", 3, - 3, wl_data_device_requests, - 6, wl_data_device_events, + .name = "wl_data_device", .version = 3, + .method_count = 3, .methods = wl_data_device_requests, + .event_count = 6, .events = wl_data_device_events, }; static const struct wl_message wl_data_device_manager_requests[] = { @@ -306,9 +303,8 @@ static const struct wl_message wl_data_device_manager_requests[] = { }; WL_EXPORT const struct wl_interface wl_data_device_manager_interface = { - "wl_data_device_manager", 3, - 2, wl_data_device_manager_requests, - 0, NULL, + .name = "wl_data_device_manager", .version = 3, + .method_count = 2, .methods = wl_data_device_manager_requests, }; static const struct wl_message wl_shell_requests[] = { @@ -316,9 +312,8 @@ static const struct wl_message wl_shell_requests[] = { }; WL_EXPORT const struct wl_interface wl_shell_interface = { - "wl_shell", 1, - 1, wl_shell_requests, - 0, NULL, + .name = "wl_shell", .version = 1, + .method_count = 1, .methods = wl_shell_requests, }; static const struct wl_message wl_shell_surface_requests[] = { @@ -341,9 +336,9 @@ static const struct wl_message wl_shell_surface_events[] = { }; WL_EXPORT const struct wl_interface wl_shell_surface_interface = { - "wl_shell_surface", 1, - 10, wl_shell_surface_requests, - 3, wl_shell_surface_events, + .name = "wl_shell_surface", .version = 1, + .method_count = 10, .methods = wl_shell_surface_requests, + .event_count = 3, .events = wl_shell_surface_events, }; static const struct wl_message wl_surface_requests[] = { @@ -365,9 +360,9 @@ static const struct wl_message wl_surface_events[] = { }; WL_EXPORT const struct wl_interface wl_surface_interface = { - "wl_surface", 4, - 10, wl_surface_requests, - 2, wl_surface_events, + .name = "wl_surface", .version = 4, + .method_count = 10, .methods = wl_surface_requests, + .event_count = 2, .events = wl_surface_events, }; static const struct wl_message wl_seat_requests[] = { @@ -383,9 +378,9 @@ static const struct wl_message wl_seat_events[] = { }; WL_EXPORT const struct wl_interface wl_seat_interface = { - "wl_seat", 6, - 4, wl_seat_requests, - 2, wl_seat_events, + .name = "wl_seat", .version = 6, + .method_count = 4, .methods = wl_seat_requests, + .event_count = 2, .events = wl_seat_events, }; static const struct wl_message wl_pointer_requests[] = { @@ -406,9 +401,9 @@ static const struct wl_message wl_pointer_events[] = { }; WL_EXPORT const struct wl_interface wl_pointer_interface = { - "wl_pointer", 6, - 2, wl_pointer_requests, - 9, wl_pointer_events, + .name = "wl_pointer", .version = 6, + .method_count = 2, .methods = wl_pointer_requests, + .event_count = 9, .events = wl_pointer_events, }; static const struct wl_message wl_keyboard_requests[] = { @@ -425,9 +420,9 @@ static const struct wl_message wl_keyboard_events[] = { }; WL_EXPORT const struct wl_interface wl_keyboard_interface = { - "wl_keyboard", 6, - 1, wl_keyboard_requests, - 6, wl_keyboard_events, + .name = "wl_keyboard", .version = 6, + .method_count = 1, .methods = wl_keyboard_requests, + .event_count = 6, .events = wl_keyboard_events, }; static const struct wl_message wl_touch_requests[] = { @@ -445,9 +440,9 @@ static const struct wl_message wl_touch_events[] = { }; WL_EXPORT const struct wl_interface wl_touch_interface = { - "wl_touch", 6, - 1, wl_touch_requests, - 7, wl_touch_events, + .name = "wl_touch", .version = 6, + .method_count = 1, .methods = wl_touch_requests, + .event_count = 7, .events = wl_touch_events, }; static const struct wl_message wl_output_requests[] = { @@ -462,9 +457,9 @@ static const struct wl_message wl_output_events[] = { }; WL_EXPORT const struct wl_interface wl_output_interface = { - "wl_output", 3, - 1, wl_output_requests, - 4, wl_output_events, + .name = "wl_output", .version = 3, + .method_count = 1, .methods = wl_output_requests, + .event_count = 4, .events = wl_output_events, }; static const struct wl_message wl_region_requests[] = { @@ -474,9 +469,8 @@ static const struct wl_message wl_region_requests[] = { }; WL_EXPORT const struct wl_interface wl_region_interface = { - "wl_region", 1, - 3, wl_region_requests, - 0, NULL, + .name = "wl_region", .version = 1, + .method_count = 3, .methods = wl_region_requests, }; static const struct wl_message wl_subcompositor_requests[] = { @@ -485,9 +479,8 @@ static const struct wl_message wl_subcompositor_requests[] = { }; WL_EXPORT const struct wl_interface wl_subcompositor_interface = { - "wl_subcompositor", 1, - 2, wl_subcompositor_requests, - 0, NULL, + .name = "wl_subcompositor", .version = 1, + .method_count = 2, .methods = wl_subcompositor_requests, }; static const struct wl_message wl_subsurface_requests[] = { @@ -500,8 +493,7 @@ static const struct wl_message wl_subsurface_requests[] = { }; WL_EXPORT const struct wl_interface wl_subsurface_interface = { - "wl_subsurface", 1, - 6, wl_subsurface_requests, - 0, NULL, + .name = "wl_subsurface", .version = 1, + .method_count = 6, .methods = wl_subsurface_requests, }; diff --git a/tests/data/small-code-core.c b/tests/data/small-code-core.c index 4f27f03..bf44cb6 100644 --- a/tests/data/small-code-core.c +++ b/tests/data/small-code-core.c @@ -54,8 +54,8 @@ static const struct wl_message intf_A_events[] = { }; WL_EXPORT const struct wl_interface intf_A_interface = { - "intf_A", 3, - 3, intf_A_requests, - 1, intf_A_events, + .name = "intf_A", .version = 3, + .method_count = 3, .methods = intf_A_requests, + .event_count = 1, .events = intf_A_events, }; diff --git a/tests/data/small-code.c b/tests/data/small-code.c index 4f27f03..bf44cb6 100644 --- a/tests/data/small-code.c +++ b/tests/data/small-code.c @@ -54,8 +54,8 @@ static const struct wl_message intf_A_events[] = { }; WL_EXPORT const struct wl_interface intf_A_interface = { - "intf_A", 3, - 3, intf_A_requests, - 1, intf_A_events, + .name = "intf_A", .version = 3, + .method_count = 3, .methods = intf_A_requests, + .event_count = 1, .events = intf_A_events, }; diff --git a/tests/data/small-private-code.c b/tests/data/small-private-code.c index 84f77de..88ecdb5 100644 --- a/tests/data/small-private-code.c +++ b/tests/data/small-private-code.c @@ -64,8 +64,8 @@ static const struct wl_message intf_A_events[] = { }; WL_PRIVATE const struct wl_interface intf_A_interface = { - "intf_A", 3, - 3, intf_A_requests, - 1, intf_A_events, + .name = "intf_A", .version = 3, + .method_count = 3, .methods = intf_A_requests, + .event_count = 1, .events = intf_A_events, }; -- 2.16.0 _______________________________________________ wayland-devel mailing list wayland-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/wayland-devel