circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-03 14:27:09 +00:00
Code Issues Projects Releases Wiki Activity

Sync OpenBSD patchset 1150:

Browse Source 
xfree is not particularly helpful, remove it. From Thomas Adam.
This commit is contained in:
Tiago Cunha
2012-07-11 19:34:16 +00:00
parent 06d27e94b2
commit a432fcd306
73 changed files with 330 additions and 360 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
tty-term.c
View File

@ -255,7 +255,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] == '@') {
@ -281,7 +281,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;
@ -299,12 +299,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 *
@ -468,10 +467,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