From a432fcd30617610b46d65f49b7513bf5da5694de Mon Sep 17 00:00:00 2001 From: Tiago Cunha Date: Wed, 11 Jul 2012 19:34:16 +0000 Subject: Sync OpenBSD patchset 1150: xfree is not particularly helpful, remove it. From Thomas Adam. --- tty-term.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'tty-term.c') diff --git a/tty-term.c b/tty-term.c index 64aced0b..0935b363 100644 --- a/tty-term.c +++ b/tty-term.c @@ -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 -- cgit