X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fbuffer.c;h=1cc3986cb42e48e3f7d31ea5d6248a68c6c11575;hb=158cbe99f972a1613b7d4d95abfe5fe48e019e67;hp=72888b508e405d5d4774844e2b3663ec0f2f76f3;hpb=ffa3a443b9f01d3ea0fcb3c4fc6928a5c695cf4a;p=meshlink

diff --git a/src/buffer.c b/src/buffer.c
index 72888b50..1cc3986c 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -1,6 +1,6 @@
 /*
     buffer.c -- buffer management
-    Copyright (C) 2011 Guus Sliepen <guus@tinc-vpn.org>,
+    Copyright (C) 2014 Guus Sliepen <guus@meshlink.io>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -22,8 +22,8 @@
 #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;
@@ -57,8 +57,8 @@ char *buffer_prepare(buffer_t *buffer, int size) {
 }
 
 // Copy data into the buffer.
-			
-char *buffer_add(buffer_t *buffer, const char *data, int 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);
-	buffer->data = 0;
+	buffer->data = NULL;
 	buffer->maxlen = 0;
 	buffer->len = 0;
 	buffer->offset = 0;