X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fbuffer.c;h=60adec862580ed6d7ef8c7e8790cdc5641d8f3ef;hp=a9e79aa95a1ac39a54b0dc6fcc8cb9f4399692a4;hb=1c475ecb575367a6b3f9328b0f643ad636155341;hpb=953f5b4231bbbb8269bb0c55b96a1c8c4bb34a59 diff --git a/src/buffer.c b/src/buffer.c index a9e79aa9..60adec86 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -22,7 +22,7 @@ #include "buffer.h" #include "xalloc.h" -void buffer_compact(buffer_t *buffer, int maxsize) { +void buffer_compact(buffer_t *buffer, uint32_t 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; @@ -32,7 +32,7 @@ void buffer_compact(buffer_t *buffer, int maxsize) { // Make sure we can add size bytes to the buffer, and return a pointer to the start of those bytes. -char *buffer_prepare(buffer_t *buffer, int size) { +char *buffer_prepare(buffer_t *buffer, uint32_t size) { if(!buffer->data) { buffer->maxlen = size; buffer->data = xmalloc(size); @@ -58,13 +58,13 @@ char *buffer_prepare(buffer_t *buffer, int size) { // Copy data into the buffer. -void buffer_add(buffer_t *buffer, const char *data, int size) { +void buffer_add(buffer_t *buffer, const char *data, uint32_t size) { memcpy(buffer_prepare(buffer, size), data, size); } // Remove given number of bytes from the buffer, return a pointer to the start of them. -static char *buffer_consume(buffer_t *buffer, int size) { +static char *buffer_consume(buffer_t *buffer, uint32_t size) { char *start = buffer->data + buffer->offset; buffer->offset += size; @@ -86,14 +86,14 @@ char *buffer_readline(buffer_t *buffer) { return NULL; } - int len = newline + 1 - (buffer->data + buffer->offset); + uint32_t len = newline + 1 - (buffer->data + buffer->offset); *newline = 0; return buffer_consume(buffer, len); } // Check if we have enough bytes in the buffer, and if so, return a pointer to the start of them. -char *buffer_read(buffer_t *buffer, int size) { +char *buffer_read(buffer_t *buffer, uint32_t size) { if(buffer->len - buffer->offset < size) { return NULL; }