From 49fa060442f702a1343c7f5b18caa6c81bd70252 Mon Sep 17 00:00:00 2001 From: Kirill Primak Date: Sat, 29 Jan 2022 23:10:22 +0300 Subject: [PATCH] output-layout: remove useless types/fields --- include/wlr/types/wlr_output_layout.h | 2 -- types/wlr_output_layout.c | 11 ----------- 2 files changed, 13 deletions(-) diff --git a/include/wlr/types/wlr_output_layout.h b/include/wlr/types/wlr_output_layout.h index f537c418..3cb6e1e2 100644 --- a/include/wlr/types/wlr_output_layout.h +++ b/include/wlr/types/wlr_output_layout.h @@ -15,7 +15,6 @@ #include struct wlr_box; -struct wlr_output_layout_state; /** * Helper to arrange outputs in a 2D coordinate space. The output effective @@ -27,7 +26,6 @@ struct wlr_output_layout_state; */ struct wlr_output_layout { struct wl_list outputs; - struct wlr_output_layout_state *state; struct { struct wl_signal add; diff --git a/types/wlr_output_layout.c b/types/wlr_output_layout.c index b102fdae..28d91e8d 100644 --- a/types/wlr_output_layout.c +++ b/types/wlr_output_layout.c @@ -8,15 +8,10 @@ #include #include "util/signal.h" -struct wlr_output_layout_state { - struct wlr_box _box; // should never be read directly, use the getter -}; - struct wlr_output_layout_output_state { struct wlr_output_layout *layout; struct wlr_output_layout_output *l_output; - struct wlr_box _box; // should never be read directly, use the getter bool auto_configured; struct wl_listener mode; @@ -31,11 +26,6 @@ struct wlr_output_layout *wlr_output_layout_create(void) { if (layout == NULL) { return NULL; } - layout->state = calloc(1, sizeof(struct wlr_output_layout_state)); - if (layout->state == NULL) { - free(layout); - return NULL; - } wl_list_init(&layout->outputs); wl_signal_init(&layout->events.add); @@ -69,7 +59,6 @@ void wlr_output_layout_destroy(struct wlr_output_layout *layout) { output_layout_output_destroy(l_output); } - free(layout->state); free(layout); }