mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-23 00:11:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

rename _container_destroy to container_finish

Browse source
This commit is contained in:
Tony Crisci 2018-04-03 11:27:27 -04:00
parent 33006c4e64
commit 7afbe9284f
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
sway/tree/container.c
View file

@ -77,7 +77,7 @@ struct sway_container *container_create(enum sway_container_type type) {
return c; return c;
} }
static struct sway_container *_container_destroy(struct sway_container *cont) { static struct sway_container *container_finish(struct sway_container *cont) {
if (cont == NULL) { if (cont == NULL) {
return NULL; return NULL;
} }
@ -124,13 +124,13 @@ static void reap_empty_func(struct sway_container *con, void *data) {
break; break;
case C_CONTAINER: case C_CONTAINER:
if (con->children->length == 0) { if (con->children->length == 0) {
_container_destroy(con); container_finish(con);
} else if (con->children->length == 1) { } else if (con->children->length == 1) {
struct sway_container *only_child = con->children->items[0]; struct sway_container *only_child = con->children->items[0];
if (only_child->type == C_CONTAINER) { if (only_child->type == C_CONTAINER) {
container_remove_child(only_child); container_remove_child(only_child);
container_replace_child(con, only_child); container_replace_child(con, only_child);
_container_destroy(con); container_finish(con);
} }
} }
case C_VIEW: case C_VIEW:
@ -146,6 +146,7 @@ struct sway_container *container_reap_empty(struct sway_container *container) {
return parent; return parent;
} }
void container_destroy(struct sway_container *cont) { void container_destroy(struct sway_container *cont) {
if (cont == NULL) { if (cont == NULL) {
return; return;
@ -155,7 +156,7 @@ void container_destroy(struct sway_container *cont) {
assert(false && "dont destroy containers with children"); assert(false && "dont destroy containers with children");
} }
_container_destroy(cont); container_finish(cont);
container_reap_empty(&root_container); container_reap_empty(&root_container);
} }