X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fbuffer.c;h=a9e79aa95a1ac39a54b0dc6fcc8cb9f4399692a4;hb=f6e87ab476a0faf8b124ecaaa27f967d825e6457;hp=315faf18e66f9dbec8e19ee4606b3d67ed984686;hpb=931e30f91a9241ab8aa705c911c92ba8943f80fd;p=tinc diff --git a/src/buffer.c b/src/buffer.c index 315faf18..a9e79aa9 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -57,7 +57,7 @@ char *buffer_prepare(buffer_t *buffer, int size) { } // Copy data into the buffer. - + void buffer_add(buffer_t *buffer, const char *data, int size) { memcpy(buffer_prepare(buffer, size), data, size); } @@ -82,8 +82,9 @@ static char *buffer_consume(buffer_t *buffer, int size) { char *buffer_readline(buffer_t *buffer) { char *newline = memchr(buffer->data + buffer->offset, '\n', buffer->len - buffer->offset); - if(!newline) + if(!newline) { return NULL; + } int len = newline + 1 - (buffer->data + buffer->offset); *newline = 0; @@ -93,15 +94,16 @@ char *buffer_readline(buffer_t *buffer) { // 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) { - if(buffer->len - buffer->offset < size) + if(buffer->len - buffer->offset < size) { return NULL; + } return buffer_consume(buffer, size); } void buffer_clear(buffer_t *buffer) { free(buffer->data); - buffer->data = 0; + buffer->data = NULL; buffer->maxlen = 0; buffer->len = 0; buffer->offset = 0;