[PATCH wayland 2/8] fixup! scanner: use c99 initializers for the wl_interface * array

Pekka Paalanen ppaalanen at gmail.com
Tue Jul 3 11:27:47 UTC 2018


On Thu, 14 Jun 2018 16:49:39 +0100
Emil Velikov <emil.l.velikov at gmail.com> wrote:

> ---
>  tests/data/example-code.c       | 190 ++++++++++++++++++++--------------------
>  tests/data/small-code-core.c    |  16 ++--
>  tests/data/small-code.c         |  16 ++--
>  tests/data/small-private-code.c |  16 ++--
>  4 files changed, 119 insertions(+), 119 deletions(-)

Hi,

Acked-by: Pekka Paalanen <pekka.paalanen at collabora.co.uk>

I'll leave upgrading to R-b for closer to landing this series when I
will test running with this.


Thanks,
pq

> 
> diff --git a/tests/data/example-code.c b/tests/data/example-code.c
> index bc03fe5..ccfa9ef 100644
> --- a/tests/data/example-code.c
> +++ b/tests/data/example-code.c
> @@ -49,101 +49,101 @@ extern const struct wl_interface wl_surface_interface;
>  extern const struct wl_interface wl_touch_interface;
>  
>  static const struct wl_interface *types[] = {
> -	NULL,
> -	NULL,
> -	NULL,
> -	NULL,
> -	NULL,
> -	NULL,
> -	NULL,
> -	NULL,
> -	&wl_callback_interface,
> -	&wl_registry_interface,
> -	&wl_surface_interface,
> -	&wl_region_interface,
> -	&wl_buffer_interface,
> -	NULL,
> -	NULL,
> -	NULL,
> -	NULL,
> -	NULL,
> -	&wl_shm_pool_interface,
> -	NULL,
> -	NULL,
> -	&wl_data_source_interface,
> -	&wl_surface_interface,
> -	&wl_surface_interface,
> -	NULL,
> -	&wl_data_source_interface,
> -	NULL,
> -	&wl_data_offer_interface,
> -	NULL,
> -	&wl_surface_interface,
> -	NULL,
> -	NULL,
> -	&wl_data_offer_interface,
> -	&wl_data_offer_interface,
> -	&wl_data_source_interface,
> -	&wl_data_device_interface,
> -	&wl_seat_interface,
> -	&wl_shell_surface_interface,
> -	&wl_surface_interface,
> -	&wl_seat_interface,
> -	NULL,
> -	&wl_seat_interface,
> -	NULL,
> -	NULL,
> -	&wl_surface_interface,
> -	NULL,
> -	NULL,
> -	NULL,
> -	NULL,
> -	NULL,
> -	&wl_output_interface,
> -	&wl_seat_interface,
> -	NULL,
> -	&wl_surface_interface,
> -	NULL,
> -	NULL,
> -	NULL,
> -	&wl_output_interface,
> -	&wl_buffer_interface,
> -	NULL,
> -	NULL,
> -	&wl_callback_interface,
> -	&wl_region_interface,
> -	&wl_region_interface,
> -	&wl_output_interface,
> -	&wl_output_interface,
> -	&wl_pointer_interface,
> -	&wl_keyboard_interface,
> -	&wl_touch_interface,
> -	NULL,
> -	&wl_surface_interface,
> -	NULL,
> -	NULL,
> -	NULL,
> -	&wl_surface_interface,
> -	NULL,
> -	NULL,
> -	NULL,
> -	&wl_surface_interface,
> -	NULL,
> -	&wl_surface_interface,
> -	NULL,
> -	NULL,
> -	&wl_surface_interface,
> -	NULL,
> -	NULL,
> -	&wl_surface_interface,
> -	NULL,
> -	NULL,
> -	NULL,
> -	&wl_subsurface_interface,
> -	&wl_surface_interface,
> -	&wl_surface_interface,
> -	&wl_surface_interface,
> -	&wl_surface_interface,
> +	[0] = NULL,
> +	[1] = NULL,
> +	[2] = NULL,
> +	[3] = NULL,
> +	[4] = NULL,
> +	[5] = NULL,
> +	[6] = NULL,
> +	[7] = NULL,
> +	[8] = &wl_callback_interface,
> +	[9] = &wl_registry_interface,
> +	[10] = &wl_surface_interface,
> +	[11] = &wl_region_interface,
> +	[12] = &wl_buffer_interface,
> +	[13] = NULL,
> +	[14] = NULL,
> +	[15] = NULL,
> +	[16] = NULL,
> +	[17] = NULL,
> +	[18] = &wl_shm_pool_interface,
> +	[19] = NULL,
> +	[20] = NULL,
> +	[21] = &wl_data_source_interface,
> +	[22] = &wl_surface_interface,
> +	[23] = &wl_surface_interface,
> +	[24] = NULL,
> +	[25] = &wl_data_source_interface,
> +	[26] = NULL,
> +	[27] = &wl_data_offer_interface,
> +	[28] = NULL,
> +	[29] = &wl_surface_interface,
> +	[30] = NULL,
> +	[31] = NULL,
> +	[32] = &wl_data_offer_interface,
> +	[33] = &wl_data_offer_interface,
> +	[34] = &wl_data_source_interface,
> +	[35] = &wl_data_device_interface,
> +	[36] = &wl_seat_interface,
> +	[37] = &wl_shell_surface_interface,
> +	[38] = &wl_surface_interface,
> +	[39] = &wl_seat_interface,
> +	[40] = NULL,
> +	[41] = &wl_seat_interface,
> +	[42] = NULL,
> +	[43] = NULL,
> +	[44] = &wl_surface_interface,
> +	[45] = NULL,
> +	[46] = NULL,
> +	[47] = NULL,
> +	[48] = NULL,
> +	[49] = NULL,
> +	[50] = &wl_output_interface,
> +	[51] = &wl_seat_interface,
> +	[52] = NULL,
> +	[53] = &wl_surface_interface,
> +	[54] = NULL,
> +	[55] = NULL,
> +	[56] = NULL,
> +	[57] = &wl_output_interface,
> +	[58] = &wl_buffer_interface,
> +	[59] = NULL,
> +	[60] = NULL,
> +	[61] = &wl_callback_interface,
> +	[62] = &wl_region_interface,
> +	[63] = &wl_region_interface,
> +	[64] = &wl_output_interface,
> +	[65] = &wl_output_interface,
> +	[66] = &wl_pointer_interface,
> +	[67] = &wl_keyboard_interface,
> +	[68] = &wl_touch_interface,
> +	[69] = NULL,
> +	[70] = &wl_surface_interface,
> +	[71] = NULL,
> +	[72] = NULL,
> +	[73] = NULL,
> +	[74] = &wl_surface_interface,
> +	[75] = NULL,
> +	[76] = NULL,
> +	[77] = NULL,
> +	[78] = &wl_surface_interface,
> +	[79] = NULL,
> +	[80] = &wl_surface_interface,
> +	[81] = NULL,
> +	[82] = NULL,
> +	[83] = &wl_surface_interface,
> +	[84] = NULL,
> +	[85] = NULL,
> +	[86] = &wl_surface_interface,
> +	[87] = NULL,
> +	[88] = NULL,
> +	[89] = NULL,
> +	[90] = &wl_subsurface_interface,
> +	[91] = &wl_surface_interface,
> +	[92] = &wl_surface_interface,
> +	[93] = &wl_surface_interface,
> +	[94] = &wl_surface_interface,
>  };
>  
>  static const struct wl_message wl_display_requests[] = {
> diff --git a/tests/data/small-code-core.c b/tests/data/small-code-core.c
> index 28a00ab..279efa6 100644
> --- a/tests/data/small-code-core.c
> +++ b/tests/data/small-code-core.c
> @@ -33,14 +33,14 @@ extern const struct wl_interface another_intf_interface;
>  extern const struct wl_interface intf_not_here_interface;
>  
>  static const struct wl_interface *types[] = {
> -	NULL,
> -	&intf_not_here_interface,
> -	NULL,
> -	NULL,
> -	NULL,
> -	NULL,
> -	NULL,
> -	&another_intf_interface,
> +	[0] = NULL,
> +	[1] = &intf_not_here_interface,
> +	[2] = NULL,
> +	[3] = NULL,
> +	[4] = NULL,
> +	[5] = NULL,
> +	[6] = NULL,
> +	[7] = &another_intf_interface,
>  };
>  
>  static const struct wl_message intf_A_requests[] = {
> diff --git a/tests/data/small-code.c b/tests/data/small-code.c
> index 28a00ab..279efa6 100644
> --- a/tests/data/small-code.c
> +++ b/tests/data/small-code.c
> @@ -33,14 +33,14 @@ extern const struct wl_interface another_intf_interface;
>  extern const struct wl_interface intf_not_here_interface;
>  
>  static const struct wl_interface *types[] = {
> -	NULL,
> -	&intf_not_here_interface,
> -	NULL,
> -	NULL,
> -	NULL,
> -	NULL,
> -	NULL,
> -	&another_intf_interface,
> +	[0] = NULL,
> +	[1] = &intf_not_here_interface,
> +	[2] = NULL,
> +	[3] = NULL,
> +	[4] = NULL,
> +	[5] = NULL,
> +	[6] = NULL,
> +	[7] = &another_intf_interface,
>  };
>  
>  static const struct wl_message intf_A_requests[] = {
> diff --git a/tests/data/small-private-code.c b/tests/data/small-private-code.c
> index 5e0bc88..35fa653 100644
> --- a/tests/data/small-private-code.c
> +++ b/tests/data/small-private-code.c
> @@ -43,14 +43,14 @@ extern const struct wl_interface another_intf_interface;
>  extern const struct wl_interface intf_not_here_interface;
>  
>  static const struct wl_interface *types[] = {
> -	NULL,
> -	&intf_not_here_interface,
> -	NULL,
> -	NULL,
> -	NULL,
> -	NULL,
> -	NULL,
> -	&another_intf_interface,
> +	[0] = NULL,
> +	[1] = &intf_not_here_interface,
> +	[2] = NULL,
> +	[3] = NULL,
> +	[4] = NULL,
> +	[5] = NULL,
> +	[6] = NULL,
> +	[7] = &another_intf_interface,
>  };
>  
>  static const struct wl_message intf_A_requests[] = {

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 833 bytes
Desc: OpenPGP digital signature
URL: <https://lists.freedesktop.org/archives/wayland-devel/attachments/20180703/1ffc1c3c/attachment-0001.sig>


More information about the wayland-devel mailing list