mirror of
				https://github.com/tmux/tmux.git
				synced 2025-11-04 00:56:10 +00:00 
			
		
		
		
	xfree is not particularly helpful, remove it. From Thomas Adam.
This commit is contained in:
		
							
								
								
									
										15
									
								
								tty-term.c
									
									
									
									
									
								
							
							
						
						
									
										15
									
								
								tty-term.c
									
									
									
									
									
								
							@@ -252,7 +252,7 @@ tty_term_override(struct tty_term *term, const char *overrides)
 | 
			
		||||
				*ptr++ = '\0';
 | 
			
		||||
				val = xstrdup(ptr);
 | 
			
		||||
				if (strunvis(val, ptr) == -1) {
 | 
			
		||||
					xfree(val);
 | 
			
		||||
					free(val);
 | 
			
		||||
					val = xstrdup(ptr);
 | 
			
		||||
				}
 | 
			
		||||
			} else if (entstr[strlen(entstr) - 1] == '@') {
 | 
			
		||||
@@ -278,7 +278,7 @@ tty_term_override(struct tty_term *term, const char *overrides)
 | 
			
		||||
					break;
 | 
			
		||||
				case TTYCODE_STRING:
 | 
			
		||||
					if (code->type == TTYCODE_STRING)
 | 
			
		||||
						xfree(code->value.string);
 | 
			
		||||
						free(code->value.string);
 | 
			
		||||
					code->value.string = xstrdup(val);
 | 
			
		||||
					code->type = ent->type;
 | 
			
		||||
					break;
 | 
			
		||||
@@ -296,12 +296,11 @@ tty_term_override(struct tty_term *term, const char *overrides)
 | 
			
		||||
				}
 | 
			
		||||
			}
 | 
			
		||||
 | 
			
		||||
			if (val != NULL)
 | 
			
		||||
				xfree(val);
 | 
			
		||||
			free(val);
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	xfree(s);
 | 
			
		||||
	free(s);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
struct tty_term *
 | 
			
		||||
@@ -463,10 +462,10 @@ tty_term_free(struct tty_term *term)
 | 
			
		||||
 | 
			
		||||
	for (i = 0; i < NTTYCODE; i++) {
 | 
			
		||||
		if (term->codes[i].type == TTYCODE_STRING)
 | 
			
		||||
			xfree(term->codes[i].value.string);
 | 
			
		||||
			free(term->codes[i].value.string);
 | 
			
		||||
	}
 | 
			
		||||
	xfree(term->name);
 | 
			
		||||
	xfree(term);
 | 
			
		||||
	free(term->name);
 | 
			
		||||
	free(term);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
int
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user