diff options
author | Ian Fan <ianfan0@gmail.com> | 2018-12-09 01:15:23 +0000 |
---|---|---|
committer | Ian Fan <ianfan0@gmail.com> | 2018-12-09 01:15:38 +0000 |
commit | 98c1e19466c0d83c8e1ca86eda5b273eda7eff3c (patch) | |
tree | b47ccc174669786e3a1df9569046886c23003a45 /sway/config.c | |
parent | Cleanup list code (diff) | |
download | sway-98c1e19466c0d83c8e1ca86eda5b273eda7eff3c.tar.gz sway-98c1e19466c0d83c8e1ca86eda5b273eda7eff3c.tar.zst sway-98c1e19466c0d83c8e1ca86eda5b273eda7eff3c.zip |
list.c: rename free_flat_list to list_free_items_and_destroy
Diffstat (limited to 'sway/config.c')
-rw-r--r-- | sway/config.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sway/config.c b/sway/config.c index 4621cad9..5b03bc56 100644 --- a/sway/config.c +++ b/sway/config.c | |||
@@ -444,7 +444,7 @@ bool load_main_config(const char *file, bool is_active, bool validating) { | |||
444 | } | 444 | } |
445 | } | 445 | } |
446 | 446 | ||
447 | free_flat_list(secconfigs); | 447 | list_free_items_and_destroy(secconfigs); |
448 | } | 448 | } |
449 | */ | 449 | */ |
450 | 450 | ||
@@ -652,7 +652,7 @@ bool read_config(FILE *file, struct sway_config *config, | |||
652 | 652 | ||
653 | if (read + length > config_size) { | 653 | if (read + length > config_size) { |
654 | wlr_log(WLR_ERROR, "Config file changed during reading"); | 654 | wlr_log(WLR_ERROR, "Config file changed during reading"); |
655 | free_flat_list(stack); | 655 | list_free_items_and_destroy(stack); |
656 | free(line); | 656 | free(line); |
657 | return false; | 657 | return false; |
658 | } | 658 | } |
@@ -681,7 +681,7 @@ bool read_config(FILE *file, struct sway_config *config, | |||
681 | } | 681 | } |
682 | char *expanded = expand_line(block, line, brace_detected > 0); | 682 | char *expanded = expand_line(block, line, brace_detected > 0); |
683 | if (!expanded) { | 683 | if (!expanded) { |
684 | free_flat_list(stack); | 684 | list_free_items_and_destroy(stack); |
685 | free(line); | 685 | free(line); |
686 | return false; | 686 | return false; |
687 | } | 687 | } |
@@ -746,7 +746,7 @@ bool read_config(FILE *file, struct sway_config *config, | |||
746 | free(line); | 746 | free(line); |
747 | free_cmd_results(res); | 747 | free_cmd_results(res); |
748 | } | 748 | } |
749 | free_flat_list(stack); | 749 | list_free_items_and_destroy(stack); |
750 | config->current_config_line_number = 0; | 750 | config->current_config_line_number = 0; |
751 | config->current_config_line = NULL; | 751 | config->current_config_line = NULL; |
752 | 752 | ||