sway

commit 8773ed39701748ba5500b4698d028795aa6e812e
parent be86d3aba602fef7b51fafa8a6e7a39d1e49817f
Author: Ryan Dwyer <ryandwyer1@gmail.com>
Date:   Wed, 27 Jun 2018 17:47:41 +1000

Fix memleak in container_get_box

Rather than allocate a structure and expect callers to free it, take a
pointer to an existing struct as an argument.

This function is no longer called anywhere though.

Diffstat:
M
include/sway/tree/container.h
 | 
2
+-
M
sway/tree/container.c
 | 
4
+---

2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/include/sway/tree/container.h b/include/sway/tree/container.h
@@ -295,6 +295,6 @@ bool container_is_floating(struct sway_container *container);
 /**
  * Get a container's box in layout coordinates.
  */
-struct wlr_box *container_get_box(struct sway_container *container);
+void container_get_box(struct sway_container *container, struct wlr_box *box);
 
 #endif
diff --git a/sway/tree/container.c b/sway/tree/container.c
@@ -988,11 +988,9 @@ bool container_is_floating(struct sway_container *container) {
 	return container->parent == workspace->sway_workspace->floating;
 }
 
-struct wlr_box *container_get_box(struct sway_container *container) {
-	struct wlr_box *box = calloc(1, sizeof(struct wlr_box));
+void container_get_box(struct sway_container *container, struct wlr_box *box) {
 	box->x = container->x;
 	box->y = container->y;
 	box->width = container->width;
 	box->height = container->height;
-	return box;
 }