diff options
| author | Nicholas Marriott <nicm@cvs.openbsd.org> | 2012-07-10 11:53:02 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicm@cvs.openbsd.org> | 2012-07-10 11:53:02 +0000 |
| commit | 0ed606e0c38d62777110f204c4bccdfd890a34ea (patch) | |
| tree | 48bd8518754ed4e6522fdbc3be9885313ad0a227 /usr.bin/tmux/cmd-if-shell.c | |
| parent | 8a386e18f9ebed887bd888ffd5bede8694b2ef62 (diff) | |
xfree is not particularly helpful, remove it. From Thomas Adam.
Diffstat (limited to 'usr.bin/tmux/cmd-if-shell.c')
| -rw-r--r-- | usr.bin/tmux/cmd-if-shell.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/usr.bin/tmux/cmd-if-shell.c b/usr.bin/tmux/cmd-if-shell.c index 93c75f68705..abb27d3a7b3 100644 --- a/usr.bin/tmux/cmd-if-shell.c +++ b/usr.bin/tmux/cmd-if-shell.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmd-if-shell.c,v 1.14 2011/10/27 22:40:15 nicm Exp $ */ +/* $OpenBSD: cmd-if-shell.c,v 1.15 2012/07/10 11:53:01 nicm Exp $ */ /* * Copyright (c) 2009 Tiago Cunha <me@tiagocunha.org> @@ -20,6 +20,7 @@ #include <sys/types.h> #include <sys/wait.h> +#include <stdlib.h> #include <string.h> #include "tmux.h" @@ -91,7 +92,7 @@ cmd_if_shell_callback(struct job *job) if (cmd_string_parse(cmd, &cmdlist, &cause) != 0) { if (cause != NULL) { ctx->error(ctx, "%s", cause); - xfree(cause); + free(cause); } return; } @@ -115,8 +116,7 @@ cmd_if_shell_free(void *data) if (ctx->curclient != NULL) ctx->curclient->references--; - if (cdata->cmd_else != NULL) - xfree(cdata->cmd_else); - xfree(cdata->cmd_if); - xfree(cdata); + free(cdata->cmd_else); + free(cdata->cmd_if); + free(cdata); } |