Merge branch 'master' into saverio

[meshlink] / src / buffer.c

diff --git a/src/buffer.c b/src/buffer.c
index 315faf18e66f9dbec8e19ee4606b3d67ed984686..1cc3986cb42e48e3f7d31ea5d6248a68c6c11575 100644 (file)
--- 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
@@ -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);
 }
@@ -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;