aboutsummaryrefslogtreecommitdiff
path: root/cmd-if-shell.c
diff options
context:
space:
mode:
authorTiago Cunha <tcunha@gmx.com>2012-07-11 19:34:16 +0000
committerTiago Cunha <tcunha@gmx.com>2012-07-11 19:34:16 +0000
commita432fcd30617610b46d65f49b7513bf5da5694de (patch)
treeb76ab1cefbd5a0020fa789b2c925f31ef9d5796b /cmd-if-shell.c
parent06d27e94b25a49f7a9824e8bfdf6fb04f6baf46e (diff)
downloadrtmux-a432fcd30617610b46d65f49b7513bf5da5694de.tar.gz
rtmux-a432fcd30617610b46d65f49b7513bf5da5694de.tar.bz2
rtmux-a432fcd30617610b46d65f49b7513bf5da5694de.zip
Sync OpenBSD patchset 1150:
xfree is not particularly helpful, remove it. From Thomas Adam.
Diffstat (limited to 'cmd-if-shell.c')
-rw-r--r--cmd-if-shell.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/cmd-if-shell.c b/cmd-if-shell.c
index 220fc33c..9123f4f3 100644
--- a/cmd-if-shell.c
+++ b/cmd-if-shell.c
@@ -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);
}