mirror of
				https://github.com/swaywm/sway.git
				synced 2025-11-03 09:01:43 -05:00 
			
		
		
		
	Merge pull request #2631 from ianyfan/swaybar
bar: remove i3bar_block_free in favour of i3bar_block_unref
This commit is contained in:
		
						commit
						b842b4f32e
					
				
					 1 changed files with 9 additions and 12 deletions
				
			
		| 
						 | 
				
			
			@ -8,10 +8,12 @@
 | 
			
		|||
#include "swaybar/config.h"
 | 
			
		||||
#include "swaybar/status_line.h"
 | 
			
		||||
 | 
			
		||||
static void i3bar_block_free(struct i3bar_block *block) {
 | 
			
		||||
	if (!block) {
 | 
			
		||||
void i3bar_block_unref(struct i3bar_block *block) {
 | 
			
		||||
	if (block == NULL) {
 | 
			
		||||
		return;
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	if (--block->ref_count == 0) {
 | 
			
		||||
		free(block->full_text);
 | 
			
		||||
		free(block->short_text);
 | 
			
		||||
		free(block->align);
 | 
			
		||||
| 
						 | 
				
			
			@ -20,11 +22,6 @@ static void i3bar_block_free(struct i3bar_block *block) {
 | 
			
		|||
		free(block->color);
 | 
			
		||||
		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) {
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue