[PATCH weston] desktop-shell: fix shell_output_destroy_move_layer unused variable

Pekka Paalanen ppaalanen at gmail.com
Tue Feb 13 14:21:41 UTC 2018


From: Pekka Paalanen <pekka.paalanen at collabora.co.uk>

/home/pq/git/weston/desktop-shell/shell.c: In function ‘shell_output_destroy_move_layer’:
/home/pq/git/weston/desktop-shell/shell.c:4718:24: warning: unused variable ‘output’ [-Wunused-variable]
  struct weston_output *output = data;

Since the data pointer is not used for anything, decided to also set it
to NULL in the caller. This caused another variable to become unused.

Signed-off-by: Pekka Paalanen <pekka.paalanen at collabora.co.uk>
---
 desktop-shell/shell.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/desktop-shell/shell.c b/desktop-shell/shell.c
index 1c35d18a..ceb45c74 100644
--- a/desktop-shell/shell.c
+++ b/desktop-shell/shell.c
@@ -4715,7 +4715,6 @@ shell_output_destroy_move_layer(struct desktop_shell *shell,
 				struct weston_layer *layer,
 				void *data)
 {
-	struct weston_output *output = data;
 	struct weston_view *view;
 
 	wl_list_for_each(view, &layer->view_list.link, layer_link.link)
@@ -4727,10 +4726,9 @@ handle_output_destroy(struct wl_listener *listener, void *data)
 {
 	struct shell_output *output_listener =
 		container_of(listener, struct shell_output, destroy_listener);
-	struct weston_output *output = output_listener->output;
 	struct desktop_shell *shell = output_listener->shell;
 
-	shell_for_each_layer(shell, shell_output_destroy_move_layer, output);
+	shell_for_each_layer(shell, shell_output_destroy_move_layer, NULL);
 
 	if (output_listener->panel_surface)
 		wl_list_remove(&output_listener->panel_surface_listener.link);
-- 
2.13.6



More information about the wayland-devel mailing list