diff options
| author |   nicm <nicm@openbsd.org> | 2012-07-10 11:53:01 +0000 |
|---|---|---|
| committer | nicm <nicm@openbsd.org> | 2012-07-10 11:53:01 +0000 |
| commit | 7d053cf95f3066c6e73307ead04fc57226a3af39 (patch) | |
| tree | efeaa09d389b020f6bce2de45058037a32cbbf0e /usr.bin/tmux/cmd-load-buffer.c | |
| parent | Instead of <arpa/inet.h> pulling in <netinet/in.h>, just copy in the (diff) | |
| download | wireguard-openbsd-7d053cf95f3066c6e73307ead04fc57226a3af39.tar.xz wireguard-openbsd-7d053cf95f3066c6e73307ead04fc57226a3af39.zip | |
xfree is not particularly helpful, remove it. From Thomas Adam.
Diffstat (limited to 'usr.bin/tmux/cmd-load-buffer.c')
| -rw-r--r-- | usr.bin/tmux/cmd-load-buffer.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/usr.bin/tmux/cmd-load-buffer.c b/usr.bin/tmux/cmd-load-buffer.c index 60eb18ea76d..8a77481fe37 100644 --- a/usr.bin/tmux/cmd-load-buffer.c +++ b/usr.bin/tmux/cmd-load-buffer.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmd-load-buffer.c,v 1.20 2012/05/21 18:27:42 nicm Exp $ */ +/* $OpenBSD: cmd-load-buffer.c,v 1.21 2012/07/10 11:53:01 nicm Exp $ */ /* * Copyright (c) 2009 Tiago Cunha <me@tiagocunha.org> @@ -62,7 +62,7 @@ cmd_load_buffer_exec(struct cmd *self, struct cmd_ctx *ctx) buffer = args_strtonum(args, 'b', 0, INT_MAX, &cause); if (cause != NULL) { ctx->error(ctx, "buffer %s", cause); - xfree(cause); + free(cause); return (-1); } } @@ -76,7 +76,7 @@ cmd_load_buffer_exec(struct cmd *self, struct cmd_ctx *ctx) buffer_ptr, &cause); if (error != 0) { ctx->error(ctx, "%s: %s", path, cause); - xfree(cause); + free(cause); return (-1); } return (1); @@ -127,15 +127,14 @@ cmd_load_buffer_exec(struct cmd *self, struct cmd_ctx *ctx) } if (paste_replace(&global_buffers, buffer, pdata, psize) != 0) { ctx->error(ctx, "no buffer %d", buffer); - xfree(pdata); + free(pdata); return (-1); } return (0); error: - if (pdata != NULL) - xfree(pdata); + free(pdata); if (f != NULL) fclose(f); return (-1); @@ -158,7 +157,7 @@ cmd_load_buffer_callback(struct client *c, int closed, void *data) psize = EVBUFFER_LENGTH(c->stdin_data); if (psize == 0 || (pdata = malloc(psize + 1)) == NULL) { - xfree(data); + free(data); return; } memcpy(pdata, EVBUFFER_DATA(c->stdin_data), psize); @@ -174,5 +173,5 @@ cmd_load_buffer_callback(struct client *c, int closed, void *data) server_push_stderr(c); } - xfree(data); + free(data); } |