summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenoit Gschwind <gschwind@gnu-log.net>2016-05-10 22:47:50 +0200
committerPekka Paalanen <pekka.paalanen@collabora.co.uk>2016-05-11 13:41:55 +0300
commit6c1cd2fd05a5970904b83f167e624d8f5c617525 (patch)
tree354329c40383a83719e3c69211b324bdfb8ded7c
parent3ff10da5711ed39ed80618a87ad52eefa80ae783 (diff)
downloadweston-6c1cd2fd05a5970904b83f167e624d8f5c617525.tar.gz
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 <gschwind@gnu-log.net> Reviewed-by: Quentin Glidic <sardemff7+git@sardemff7.net> Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
-rw-r--r--src/main.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main.c b/src/main.c
index 7f364543..1cae93fa 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, &section, &section_name)) {
+ while (weston_config_next_section(wc, &section, &section_name)) {
if (!section_name || strcmp(section_name, "output") != 0)
continue;
weston_config_section_get_string(section, "name", &name, NULL);