From 6c1cd2fd05a5970904b83f167e624d8f5c617525 Mon Sep 17 00:00:00 2001 From: Benoit Gschwind Date: Tue, 10 May 2016 22:47:50 +0200 Subject: [PATCH] main: rename load_wayland_backend_config arg "config" to wc Rename the load_wayland_backend_config arg "config" to use this name for another variable in the following patch. It also follow the legacy naming scheme. Signed-off-by: Benoit Gschwind Reviewed-by: Quentin Glidic Reviewed-by: Pekka Paalanen --- src/main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main.c b/src/main.c index 7f36454..1cae93f 100644 --- a/src/main.c +++ b/src/main.c @@ -1120,7 +1120,7 @@ wayland_backend_config_add_new_output(struct weston_wayland_backend_config *new_ static int load_wayland_backend_config(struct weston_compositor *compositor, int *argc, - char *argv[], struct weston_config *config, + char *argv[], struct weston_config *wc, struct weston_wayland_backend_config *out_config) { struct weston_wayland_backend_config new_config = {{ 0, }}; @@ -1157,7 +1157,7 @@ load_wayland_backend_config(struct weston_compositor *compositor, int *argc, new_config.base.struct_size = sizeof(struct weston_wayland_backend_config); new_config.base.struct_version = WESTON_WAYLAND_BACKEND_CONFIG_VERSION; - section = weston_config_get_section(config, "shell", NULL, NULL); + section = weston_config_get_section(wc, "shell", NULL, NULL); weston_config_section_get_string(section, "cursor-theme", &new_config.cursor_theme, NULL); weston_config_section_get_int(section, "cursor-size", @@ -1185,7 +1185,7 @@ load_wayland_backend_config(struct weston_compositor *compositor, int *argc, } section = NULL; - while (weston_config_next_section(config, §ion, §ion_name)) { + while (weston_config_next_section(wc, §ion, §ion_name)) { if (!section_name || strcmp(section_name, "output") != 0) continue; weston_config_section_get_string(section, "name", &name, NULL); -- 2.7.4