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. --- cfg.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'cfg.c') diff --git a/cfg.c b/cfg.c index 4d6a45c9..b1c67cbb 100644 --- a/cfg.c +++ b/cfg.c @@ -21,6 +21,7 @@ #include #include +#include #include #include "tmux.h" @@ -117,14 +118,14 @@ load_cfg(const char *path, struct cmd_ctx *ctxin, struct causelist *causes) line = NULL; if (cmd_string_parse(buf, &cmdlist, &cause) != 0) { - xfree(buf); + free(buf); if (cause == NULL) continue; cfg_add_cause(causes, "%s: %u: %s", path, n, cause); - xfree(cause); + free(cause); continue; } else - xfree(buf); + free(buf); if (cmdlist == NULL) continue; cfg_cause = NULL; @@ -150,13 +151,13 @@ load_cfg(const char *path, struct cmd_ctx *ctxin, struct causelist *causes) if (cfg_cause != NULL) { cfg_add_cause( causes, "%s: %d: %s", path, n, cfg_cause); - xfree(cfg_cause); + free(cfg_cause); } } if (line != NULL) { cfg_add_cause(causes, "%s: %d: line continuation at end of file", path, n); - xfree(line); + free(line); } fclose(f); -- cgit