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

Merge pull request #2631 from ianyfan/swaybar

Browse Source 
bar: remove i3bar_block_free in favour of i3bar_block_unref
This commit is contained in:
emersion 2018-09-14 22:19:40 +02:00 committed by GitHub
commit b842b4f32e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
swaybar/i3bar.c
View File

@ -8,10 +8,12 @@
#include "swaybar/config.h" #include "swaybar/config.h"
#include "swaybar/status_line.h" #include "swaybar/status_line.h"
static void i3bar_block_free(struct i3bar_block *block) { void i3bar_block_unref(struct i3bar_block *block) {
if (!block) { if (block == NULL) {
return; return;
} }
if (--block->ref_count == 0) {
free(block->full_text); free(block->full_text);
free(block->short_text); free(block->short_text);
free(block->align); free(block->align);
@ -20,11 +22,6 @@ static void i3bar_block_free(struct i3bar_block *block) {
free(block->color); free(block->color);
free(block); free(block);
} }
void i3bar_block_unref(struct i3bar_block *block) {
if (--block->ref_count == 0) {
i3bar_block_free(block);
}
} }
static bool i3bar_parse_json(struct status_line *status, const char *text) { static bool i3bar_parse_json(struct status_line *status, const char *text) {