From 37c6a1f275f7fbc37035090c4f7af664dff7cae8 Mon Sep 17 00:00:00 2001 From: Benoit Gschwind Date: Tue, 10 May 2016 22:47:46 +0200 Subject: [PATCH] compositor-wayland: rename wayland_output_init_from_config Rename wayland_output_init_from_config to weston_wayland_output_config_init to prepare the following patch : "compositor-wayland: move configuration parsing to weston" Signed-off-by: Benoit Gschwind Reviewed-by: Quentin Glidic [Pekka: drop a useless comment] Signed-off-by: Pekka Paalanen --- src/compositor-wayland.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/compositor-wayland.c b/src/compositor-wayland.c index 4799f90..a6db552 100644 --- a/src/compositor-wayland.c +++ b/src/compositor-wayland.c @@ -1092,10 +1092,10 @@ err_name: } static void -wayland_output_init_from_config(struct weston_wayland_backend_output_config *output, - struct weston_config_section *config_section, - int option_width, int option_height, - int option_scale) +weston_wayland_output_config_init(struct weston_wayland_backend_output_config *output, + struct weston_config_section *config_section, + int option_width, int option_height, + int option_scale) { char *mode, *t, *str; unsigned int slen; @@ -2441,8 +2441,8 @@ load_wayland_backend_config(struct weston_compositor *compositor, int *argc, if (!oc) goto err_outputs; - wayland_output_init_from_config(oc, section, width, - height, scale); + weston_wayland_output_config_init(oc, section, width, + height, scale); --count; } -- 2.7.4