diff options
author | emersion <contact@emersion.fr> | 2018-09-14 22:19:40 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-09-14 22:19:40 +0200 |
commit | b842b4f32ef6073b35c7173d704e4f62b41bf925 (patch) | |
tree | d34297bcf76292c91d6d2e6e4d5a23eda654c407 | |
parent | Merge pull request #2629 from RedSoxFan/fix-654 (diff) | |
parent | bar: remove i3bar_block_free in favour of i3bar_block_unref (diff) | |
download | sway-b842b4f32ef6073b35c7173d704e4f62b41bf925.tar.gz sway-b842b4f32ef6073b35c7173d704e4f62b41bf925.tar.zst sway-b842b4f32ef6073b35c7173d704e4f62b41bf925.zip |
Merge pull request #2631 from ianyfan/swaybar
bar: remove i3bar_block_free in favour of i3bar_block_unref
-rw-r--r-- | swaybar/i3bar.c | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/swaybar/i3bar.c b/swaybar/i3bar.c index 1345ee9b..0becae5d 100644 --- a/swaybar/i3bar.c +++ b/swaybar/i3bar.c | |||
@@ -8,22 +8,19 @@ | |||
8 | #include "swaybar/config.h" | 8 | #include "swaybar/config.h" |
9 | #include "swaybar/status_line.h" | 9 | #include "swaybar/status_line.h" |
10 | 10 | ||
11 | static void i3bar_block_free(struct i3bar_block *block) { | 11 | void i3bar_block_unref(struct i3bar_block *block) { |
12 | if (!block) { | 12 | if (block == NULL) { |
13 | return; | 13 | return; |
14 | } | 14 | } |
15 | free(block->full_text); | ||
16 | free(block->short_text); | ||
17 | free(block->align); | ||
18 | free(block->name); | ||
19 | free(block->instance); | ||
20 | free(block->color); | ||
21 | free(block); | ||
22 | } | ||
23 | 15 | ||
24 | void i3bar_block_unref(struct i3bar_block *block) { | ||
25 | if (--block->ref_count == 0) { | 16 | if (--block->ref_count == 0) { |
26 | i3bar_block_free(block); | 17 | free(block->full_text); |
18 | free(block->short_text); | ||
19 | free(block->align); | ||
20 | free(block->name); | ||
21 | free(block->instance); | ||
22 | free(block->color); | ||
23 | free(block); | ||
27 | } | 24 | } |
28 | } | 25 | } |
29 | 26 | ||