[PATCH weston 11/12] weston: Rename weston_output_init_pending() to weston_output_init()

[Quentin Glidic]

On 14/08/2016 17:28, Armin Krezović wrote:
> Signed-off-by: Armin Krezović <krezovic.armin at gmail.com>

Good:
Reviewed-by: Quentin Glidic <sardemff7+git at sardemff7.net>

Cheers,


> ---
>  libweston/compositor-drm.c      | 2 +-
>  libweston/compositor-fbdev.c    | 2 +-
>  libweston/compositor-headless.c | 2 +-
>  libweston/compositor-rdp.c      | 2 +-
>  libweston/compositor-wayland.c  | 4 ++--
>  libweston/compositor-x11.c      | 2 +-
>  libweston/compositor.c          | 6 +++---
>  libweston/compositor.h          | 8 +++-----
>  8 files changed, 13 insertions(+), 15 deletions(-)
>
> diff --git a/libweston/compositor-drm.c b/libweston/compositor-drm.c
> index adba13c..ca79fb5 100644
> --- a/libweston/compositor-drm.c
> +++ b/libweston/compositor-drm.c
> @@ -2564,7 +2564,7 @@ create_output_for_connector(struct drm_backend *b,
>  	output->disable_pending = 0;
>  	output->original_crtc = NULL;
>
> -	weston_output_init_pending(&output->base, b->compositor);
> +	weston_output_init(&output->base, b->compositor);
>
>  	return 0;
>  }
> diff --git a/libweston/compositor-fbdev.c b/libweston/compositor-fbdev.c
> index afa1e7a..0dad030 100644
> --- a/libweston/compositor-fbdev.c
> +++ b/libweston/compositor-fbdev.c
> @@ -498,7 +498,7 @@ fbdev_output_create(struct fbdev_backend *backend,
>  	output->base.disable = NULL;
>  	output->base.enable = fbdev_output_enable;
>
> -	weston_output_init_pending(&output->base, backend->compositor);
> +	weston_output_init(&output->base, backend->compositor);
>
>  	/* only one static mode in list */
>  	output->mode.flags =
> diff --git a/libweston/compositor-headless.c b/libweston/compositor-headless.c
> index a94770f..278c067 100644
> --- a/libweston/compositor-headless.c
> +++ b/libweston/compositor-headless.c
> @@ -224,7 +224,7 @@ headless_output_create(struct weston_compositor *compositor,
>  	output->base.disable = headless_output_disable;
>  	output->base.enable = headless_output_enable;
>
> -	weston_output_init_pending(&output->base, compositor);
> +	weston_output_init(&output->base, compositor);
>
>  	return 0;
>  }
> diff --git a/libweston/compositor-rdp.c b/libweston/compositor-rdp.c
> index ffa2fdf..131cf36 100644
> --- a/libweston/compositor-rdp.c
> +++ b/libweston/compositor-rdp.c
> @@ -570,7 +570,7 @@ rdp_backend_create_output(struct weston_compositor *compositor)
>  	output->base.disable = rdp_output_disable;
>  	output->base.enable = rdp_output_enable;
>
> -	weston_output_init_pending(&output->base, compositor);
> +	weston_output_init(&output->base, compositor);
>
>  	return 0;
>  }
> diff --git a/libweston/compositor-wayland.c b/libweston/compositor-wayland.c
> index 4b0113f..cffcd42 100644
> --- a/libweston/compositor-wayland.c
> +++ b/libweston/compositor-wayland.c
> @@ -1127,7 +1127,7 @@ wayland_output_create(struct weston_compositor *compositor, const char *name)
>
>  	output->base.name = name ? strdup(name) : NULL;
>
> -	weston_output_init_pending(&output->base, compositor);
> +	weston_output_init(&output->base, compositor);
>
>  	return 0;
>  }
> @@ -1226,7 +1226,7 @@ wayland_output_create_for_parent_output(struct wayland_backend *b,
>  	output->user_data = poutput;
>  	output->base.name = NULL;
>
> -	weston_output_init_pending(&output->base, b->compositor);
> +	weston_output_init(&output->base, b->compositor);
>
>  	return 0;
>  }
> diff --git a/libweston/compositor-x11.c b/libweston/compositor-x11.c
> index 5720ddf..cf9d835 100644
> --- a/libweston/compositor-x11.c
> +++ b/libweston/compositor-x11.c
> @@ -1019,7 +1019,7 @@ x11_output_create(struct weston_compositor *compositor,
>  	output->base.disable = x11_output_disable;
>  	output->base.enable = x11_output_enable;
>
> -	weston_output_init_pending(&output->base, compositor);
> +	weston_output_init(&output->base, compositor);
>
>  	return 0;
>  }
> diff --git a/libweston/compositor.c b/libweston/compositor.c
> index 847031f..01dc008 100644
> --- a/libweston/compositor.c
> +++ b/libweston/compositor.c
> @@ -4415,8 +4415,8 @@ weston_output_set_transform(struct weston_output *output,
>   * disable before it returns.
>   */
>  WL_EXPORT void
> -weston_output_init_pending(struct weston_output *output,
> -			   struct weston_compositor *compositor)
> +weston_output_init(struct weston_output *output,
> +		   struct weston_compositor *compositor)
>  {
>  	output->compositor = compositor;
>  	output->destroying = 0;
> @@ -4560,7 +4560,7 @@ weston_output_enable(struct weston_output *output)
>   *
>   * \param output The weston_output object that needs to be disabled.
>   *
> - * See weston_output_init_pending() for more information on the
> + * See weston_output_init() for more information on the
>   * state output is returned to.
>   *
>   * Calls a backend specific function to disable an output, in case
> diff --git a/libweston/compositor.h b/libweston/compositor.h
> index 9c528c3..2dc3979 100644
> --- a/libweston/compositor.h
> +++ b/libweston/compositor.h
> @@ -1616,9 +1616,7 @@ void
>  weston_output_update_matrix(struct weston_output *output);
>  void
>  weston_output_move(struct weston_output *output, int x, int y);
> -void
> -weston_output_init(struct weston_output *output, struct weston_compositor *c,
> -		   int x, int y, int width, int height, uint32_t transform, int32_t scale);
> +
>  void
>  weston_compositor_add_output(struct weston_compositor *compositor,
>                               struct weston_output *output);
> @@ -1835,8 +1833,8 @@ weston_output_set_transform(struct weston_output *output,
>  			    uint32_t transform);
>
>  void
> -weston_output_init_pending(struct weston_output *output,
> -			   struct weston_compositor *compositor);
> +weston_output_init(struct weston_output *output,
> +		   struct weston_compositor *compositor);
>
>  int
>  weston_output_enable(struct weston_output *output);
>


-- 

Quentin “Sardem FF7” Glidic