summaryrefslogtreecommitdiffstats
path: root/paste.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 /paste.c
parent06d27e94b25a49f7a9824e8bfdf6fb04f6baf46e (diff)
Sync OpenBSD patchset 1150:
xfree is not particularly helpful, remove it. From Thomas Adam.
Diffstat (limited to 'paste.c')
-rw-r--r--paste.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/paste.c b/paste.c
index f2f1fed6..b3e59562 100644
--- a/paste.c
+++ b/paste.c
@@ -19,6 +19,7 @@
#include <sys/types.h>
#include <sys/time.h>
+#include <stdlib.h>
#include <string.h>
#include "tmux.h"
@@ -69,8 +70,8 @@ paste_free_top(struct paste_stack *ps)
pb = ARRAY_FIRST(ps);
ARRAY_REMOVE(ps, 0);
- xfree(pb->data);
- xfree(pb);
+ free(pb->data);
+ free(pb);
return (0);
}
@@ -87,8 +88,8 @@ paste_free_index(struct paste_stack *ps, u_int idx)
pb = ARRAY_ITEM(ps, idx);
ARRAY_REMOVE(ps, idx);
- xfree(pb->data);
- xfree(pb);
+ free(pb->data);
+ free(pb);
return (0);
}
@@ -107,8 +108,8 @@ paste_add(struct paste_stack *ps, char *data, size_t size, u_int limit)
while (ARRAY_LENGTH(ps) >= limit) {
pb = ARRAY_LAST(ps);
- xfree(pb->data);
- xfree(pb);
+ free(pb->data);
+ free(pb);
ARRAY_TRUNC(ps, 1);
}
@@ -136,7 +137,7 @@ paste_replace(struct paste_stack *ps, u_int idx, char *data, size_t size)
return (-1);
pb = ARRAY_ITEM(ps, idx);
- xfree(pb->data);
+ free(pb->data);
pb->data = data;
pb->size = size;