[PATCH weston v4 11/14] compositor-wayland: rename out_config arg of load_wayland_backend_config

[Benoit Gschwind]

Rename the out_config arg of load_wayland_backend_config to follow
legacy naming convention.

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

diff --git a/src/main.c b/src/main.c
index e03bde7..e28a576 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1121,7 +1121,7 @@ weston_wayland_backend_config_add_new_output(struct weston_wayland_backend_confi
 static int
 load_wayland_backend_config(struct weston_compositor *compositor, int *argc,
 			    char *argv[], struct weston_config *wc,
-			    struct weston_wayland_backend_config *out_config)
+			    struct weston_wayland_backend_config *config)
 {
 	struct weston_config_section *section;
 	struct weston_wayland_backend_output_config *oc;
@@ -1133,42 +1133,42 @@ load_wayland_backend_config(struct weston_compositor *compositor, int *argc,
 		{ WESTON_OPTION_INTEGER, "width", 0, &width },
 		{ WESTON_OPTION_INTEGER, "height", 0, &height },
 		{ WESTON_OPTION_INTEGER, "scale", 0, &scale },
-		{ WESTON_OPTION_STRING, "display", 0, &out_config->display_name },
-		{ WESTON_OPTION_BOOLEAN, "use-pixman", 0, &out_config->use_pixman },
+		{ WESTON_OPTION_STRING, "display", 0, &config->display_name },
+		{ WESTON_OPTION_BOOLEAN, "use-pixman", 0, &config->use_pixman },
 		{ WESTON_OPTION_INTEGER, "output-count", 0, &count },
-		{ WESTON_OPTION_BOOLEAN, "fullscreen", 0, &out_config->fullscreen },
-		{ WESTON_OPTION_BOOLEAN, "sprawl", 0, &out_config->sprawl },
+		{ WESTON_OPTION_BOOLEAN, "fullscreen", 0, &config->fullscreen },
+		{ WESTON_OPTION_BOOLEAN, "sprawl", 0, &config->sprawl },
 	};
 
 	width = 0;
 	height = 0;
 	scale = 0;
-	out_config->display_name = NULL;
-	out_config->use_pixman = 0;
+	config->display_name = NULL;
+	config->use_pixman = 0;
 	count = 1;
-	out_config->fullscreen = 0;
-	out_config->sprawl = 0;
+	config->fullscreen = 0;
+	config->sprawl = 0;
 	parse_options(wayland_options,
 		      ARRAY_LENGTH(wayland_options), argc, argv);
 
-	out_config->cursor_size = 32;
-	out_config->cursor_theme = NULL;
-	out_config->base.struct_size = sizeof(struct weston_wayland_backend_config);
-	out_config->base.struct_version = WESTON_WAYLAND_BACKEND_CONFIG_VERSION;
+	config->cursor_size = 32;
+	config->cursor_theme = NULL;
+	config->base.struct_size = sizeof(struct weston_wayland_backend_config);
+	config->base.struct_version = WESTON_WAYLAND_BACKEND_CONFIG_VERSION;
 
 	section = weston_config_get_section(wc, "shell", NULL, NULL);
 	weston_config_section_get_string(section, "cursor-theme",
-					 &out_config->cursor_theme, NULL);
+					 &config->cursor_theme, NULL);
 	weston_config_section_get_int(section, "cursor-size",
-				      &out_config->cursor_size, 32);
+				      &config->cursor_size, 32);
 
-	if (out_config->sprawl) {
+	if (config->sprawl) {
 		/* do nothing, everything is already set */
 		return 0;
 	}
 
-	if (out_config->fullscreen) {
-		oc = weston_wayland_backend_config_add_new_output(out_config);
+	if (config->fullscreen) {
+		oc = weston_wayland_backend_config_add_new_output(config);
 		if (!oc)
 			goto err_outputs;
 
@@ -1195,7 +1195,7 @@ load_wayland_backend_config(struct weston_compositor *compositor, int *argc,
 		}
 		free(name);
 
-		oc = weston_wayland_backend_config_add_new_output(out_config);
+		oc = weston_wayland_backend_config_add_new_output(config);
 
 		if (!oc)
 			goto err_outputs;
@@ -1213,7 +1213,7 @@ load_wayland_backend_config(struct weston_compositor *compositor, int *argc,
 		scale = 1;
 	while (count > 0) {
 
-		oc = weston_wayland_backend_config_add_new_output(out_config);
+		oc = weston_wayland_backend_config_add_new_output(config);
 
 		if (!oc)
 			goto err_outputs;
@@ -1230,7 +1230,7 @@ load_wayland_backend_config(struct weston_compositor *compositor, int *argc,
 	return 0;
 
 err_outputs:
-	weston_wayland_backend_config_release(out_config);
+	weston_wayland_backend_config_release(config);
 	return -1;
 }
 
-- 
2.7.3