projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove info-in-builddir option from AM_INIT_AUTOMAKE().
[tinc]
/
src
/
buffer.c
diff --git
a/src/buffer.c
b/src/buffer.c
index
249e3e0
..
ac57d1c
100644
(file)
--- a/
src/buffer.c
+++ b/
src/buffer.c
@@
-22,8
+22,8
@@
#include "buffer.h"
#include "xalloc.h"
#include "buffer.h"
#include "xalloc.h"
-void buffer_compact(buffer_t *buffer) {
- if(buffer->offset / 7 > buffer->len / 8) {
+void buffer_compact(buffer_t *buffer
, int maxsize
) {
+ if(buffer->
len >= maxsize || buffer->
offset / 7 > buffer->len / 8) {
memmove(buffer->data, buffer->data + buffer->offset, buffer->len - buffer->offset);
buffer->len -= buffer->offset;
buffer->offset = 0;
memmove(buffer->data, buffer->data + buffer->offset, buffer->len - buffer->offset);
buffer->len -= buffer->offset;
buffer->offset = 0;
@@
-57,7
+57,7
@@
char *buffer_prepare(buffer_t *buffer, int size) {
}
// Copy data into the buffer.
}
// Copy data into the buffer.
-
+
void buffer_add(buffer_t *buffer, const char *data, int size) {
memcpy(buffer_prepare(buffer, size), data, size);
}
void buffer_add(buffer_t *buffer, const char *data, int size) {
memcpy(buffer_prepare(buffer, size), data, size);
}
@@
-101,7
+101,7
@@
char *buffer_read(buffer_t *buffer, int size) {
void buffer_clear(buffer_t *buffer) {
free(buffer->data);
void buffer_clear(buffer_t *buffer) {
free(buffer->data);
- buffer->data =
0
;
+ buffer->data =
NULL
;
buffer->maxlen = 0;
buffer->len = 0;
buffer->offset = 0;
buffer->maxlen = 0;
buffer->len = 0;
buffer->offset = 0;