[PATCH weston v3 12/17] compositor-wayland: refactor wayland_backend_create

Benoit Gschwind gschwind at gnu-log.net
Thu May 5 20:45:50 UTC 2016


Rename new_config to config in wayland_backend_create function.

Signed-off-by: Benoit Gschwind <gschwind at gnu-log.net>
---
 src/compositor-wayland.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/compositor-wayland.c b/src/compositor-wayland.c
index 140b11d..133bd37 100644
--- a/src/compositor-wayland.c
+++ b/src/compositor-wayland.c
@@ -2169,7 +2169,7 @@ fullscreen_binding(struct weston_keyboard *keyboard, uint32_t time,
 
 static struct wayland_backend *
 wayland_backend_create(struct weston_compositor *compositor,
-		       struct weston_wayland_backend_config *new_config)
+		       struct weston_wayland_backend_config *config)
 {
 	struct wayland_backend *b;
 	struct wl_event_loop *loop;
@@ -2183,7 +2183,7 @@ wayland_backend_create(struct weston_compositor *compositor,
 	if (weston_compositor_set_presentation_clock_software(compositor) < 0)
 		goto err_compositor;
 
-	b->parent.wl_display = wl_display_connect(new_config->display_name);
+	b->parent.wl_display = wl_display_connect(config->display_name);
 	if (b->parent.wl_display == NULL) {
 		weston_log("failed to create display: %m\n");
 		goto err_compositor;
@@ -2195,9 +2195,9 @@ wayland_backend_create(struct weston_compositor *compositor,
 	wl_registry_add_listener(b->parent.registry, &registry_listener, b);
 	wl_display_roundtrip(b->parent.wl_display);
 
-	create_cursor(b, new_config);
+	create_cursor(b, config);
 
-	b->use_pixman = new_config->use_pixman;
+	b->use_pixman = config->use_pixman;
 
 	if (!b->use_pixman) {
 		gl_renderer = weston_load_module("gl-renderer.so",
-- 
2.7.3



More information about the wayland-devel mailing list