mirror of
https://github.com/tmate-io/tmate.git
synced 2025-08-09 13:54:54 +02:00
Sync OpenBSD patchset 1150:
xfree is not particularly helpful, remove it. From Thomas Adam.
This commit is contained in:
15
paste.c
15
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;
|
||||
|
Reference in New Issue
Block a user