From 98c1e19466c0d83c8e1ca86eda5b273eda7eff3c Mon Sep 17 00:00:00 2001
From: Ian Fan <ianfan0@gmail.com>
Date: Sun, 9 Dec 2018 01:15:23 +0000
Subject: list.c: rename free_flat_list to list_free_items_and_destroy

---
 sway/commands/bar/modifier.c | 4 ++--
 sway/commands/bind.c         | 6 +++---
 sway/commands/reload.c       | 4 ++--
 sway/commands/workspace.c    | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'sway/commands')

diff --git a/sway/commands/bar/modifier.c b/sway/commands/bar/modifier.c
index 1b3e7492..b5a16f45 100644
--- a/sway/commands/bar/modifier.c
+++ b/sway/commands/bar/modifier.c
@@ -23,11 +23,11 @@ struct cmd_results *bar_cmd_modifier(int argc, char **argv) {
 		} else {
 			error = cmd_results_new(CMD_INVALID, "modifier",
 				"Unknown modifier '%s'", split->items[i]);
-			free_flat_list(split);
+			list_free_items_and_destroy(split);
 			return error;
 		}
 	}
-	free_flat_list(split);
+	list_free_items_and_destroy(split);
 	config->current_bar->modifier = mod;
 	wlr_log(WLR_DEBUG,
 			"Show/Hide the bar when pressing '%s' in hide mode.", argv[0]);
diff --git a/sway/commands/bind.c b/sway/commands/bind.c
index 886a262c..01a35cf2 100644
--- a/sway/commands/bind.c
+++ b/sway/commands/bind.c
@@ -23,7 +23,7 @@ void free_sway_binding(struct sway_binding *binding) {
 		return;
 	}
 
-	free_flat_list(binding->keys);
+	list_free_items_and_destroy(binding->keys);
 	free(binding->input);
 	free(binding->command);
 	free(binding);
@@ -220,14 +220,14 @@ static struct cmd_results *cmd_bindsym_or_bindcode(int argc, char **argv,
 		uint32_t *key = calloc(1, sizeof(uint32_t));
 		if (!key) {
 			free_sway_binding(binding);
-			free_flat_list(split);
+			list_free_items_and_destroy(split);
 			return cmd_results_new(CMD_FAILURE, bindtype,
 					"Unable to allocate binding key");
 		}
 		*key = key_val;
 		list_add(binding->keys, key);
 	}
-	free_flat_list(split);
+	list_free_items_and_destroy(split);
 	binding->order = binding_order++;
 
 	// refine region of interest for mouse binding once we are certain
diff --git a/sway/commands/reload.c b/sway/commands/reload.c
index c236911e..3ccbbf34 100644
--- a/sway/commands/reload.c
+++ b/sway/commands/reload.c
@@ -24,7 +24,7 @@ static void do_reload(void *data) {
 
 	if (!load_main_config(config->current_config_path, true, false)) {
 		wlr_log(WLR_ERROR, "Error(s) reloading config");
-		free_flat_list(bar_ids);
+		list_free_items_and_destroy(bar_ids);
 		return;
 	}
 
@@ -41,7 +41,7 @@ static void do_reload(void *data) {
 			}
 		}
 	}
-	free_flat_list(bar_ids);
+	list_free_items_and_destroy(bar_ids);
 
 	config_update_font_height(true);
 	root_for_each_container(rebuild_textures_iterator, NULL);
diff --git a/sway/commands/workspace.c b/sway/commands/workspace.c
index 7d32e65b..211b344d 100644
--- a/sway/commands/workspace.c
+++ b/sway/commands/workspace.c
@@ -33,7 +33,7 @@ static struct workspace_config *workspace_config_find_or_create(char *ws_name) {
 
 void free_workspace_config(struct workspace_config *wsc) {
 	free(wsc->workspace);
-	free_flat_list(wsc->outputs);
+	list_free_items_and_destroy(wsc->outputs);
 	free(wsc);
 }
 
-- 
cgit v1.2.3