diff options
author | Brian Ashworth <bosrsf04@gmail.com> | 2018-10-09 08:12:02 -0400 |
---|---|---|
committer | Brian Ashworth <bosrsf04@gmail.com> | 2018-10-09 08:12:46 -0400 |
commit | d3f0e52784712696c7174d3adf8ec6cf3ac31b19 (patch) | |
tree | 313ca9e6eb03e9f5971d3fde90ace73b613ca9e4 /swaybar/config.c | |
parent | Implement bar bindsym (diff) | |
download | sway-d3f0e52784712696c7174d3adf8ec6cf3ac31b19.tar.gz sway-d3f0e52784712696c7174d3adf8ec6cf3ac31b19.tar.zst sway-d3f0e52784712696c7174d3adf8ec6cf3ac31b19.zip |
bar-bindsym: address ianyfan's comments
Diffstat (limited to 'swaybar/config.c')
-rw-r--r-- | swaybar/config.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/swaybar/config.c b/swaybar/config.c index c646fe66..09d40c24 100644 --- a/swaybar/config.c +++ b/swaybar/config.c | |||
@@ -72,16 +72,22 @@ struct swaybar_config *init_config(void) { | |||
72 | return config; | 72 | return config; |
73 | } | 73 | } |
74 | 74 | ||
75 | static void free_binding(struct swaybar_binding *binding) { | ||
76 | if (!binding) { | ||
77 | return; | ||
78 | } | ||
79 | free(binding->command); | ||
80 | free(binding); | ||
81 | } | ||
82 | |||
75 | void free_config(struct swaybar_config *config) { | 83 | void free_config(struct swaybar_config *config) { |
76 | free(config->status_command); | 84 | free(config->status_command); |
77 | free(config->font); | 85 | free(config->font); |
78 | free(config->mode); | 86 | free(config->mode); |
79 | free(config->sep_symbol); | 87 | free(config->sep_symbol); |
80 | while (config->bindings->length) { | 88 | for (int i = 0; i < config->bindings->length; i++) { |
81 | struct swaybar_binding *binding = config->bindings->items[0]; | 89 | struct swaybar_binding *binding = config->bindings->items[i]; |
82 | list_del(config->bindings, 0); | 90 | free_binding(binding); |
83 | free(binding->command); | ||
84 | free(binding); | ||
85 | } | 91 | } |
86 | list_free(config->bindings); | 92 | list_free(config->bindings); |
87 | struct config_output *coutput, *tmp; | 93 | struct config_output *coutput, *tmp; |