Use guint8 rather than guchar for raw octets and pointers to arrays of

[metze/wireshark/wip.git] / wiretap / buffer.c

diff --git a/wiretap/buffer.c b/wiretap/buffer.c
index eae751cbd7bbb3fc9eda942cc449362b900877e7..bd5a94e3a665e7d16328351967c7dc46bdcf9c4a 100644 (file)
--- a/wiretap/buffer.c
+++ b/wiretap/buffer.c
@@ -34,7 +34,7 @@
 /* Initializes a buffer with a certain amount of allocated space */
 void buffer_init(Buffer* buffer, gsize space)
 {
-       buffer->data = (guchar*)g_malloc(space);
+       buffer->data = (guint8*)g_malloc(space);
        buffer->allocated = space;
        buffer->start = 0;
        buffer->first_free = 0;
@@ -84,10 +84,10 @@ void buffer_assure_space(Buffer* buffer, gsize space)
 
        /* We'll allocate more space */
        buffer->allocated += space + 1024;
-       buffer->data = (guchar*)g_realloc(buffer->data, buffer->allocated);
+       buffer->data = (guint8*)g_realloc(buffer->data, buffer->allocated);
 }
 
-void buffer_append(Buffer* buffer, guchar *from, gsize bytes)
+void buffer_append(Buffer* buffer, guint8 *from, gsize bytes)
 {
        buffer_assure_space(buffer, bytes);
        memcpy(buffer->data + buffer->first_free, from, bytes);
@@ -133,14 +133,14 @@ gsize buffer_length(Buffer* buffer)
 #endif
 
 #ifndef SOME_FUNCTIONS_ARE_DEFINES
-guchar* buffer_start_ptr(Buffer* buffer)
+guint8* buffer_start_ptr(Buffer* buffer)
 {
        return buffer->data + buffer->start;
 }
 #endif
 
 #ifndef SOME_FUNCTIONS_ARE_DEFINES
-guchar* buffer_end_ptr(Buffer* buffer)
+guint8* buffer_end_ptr(Buffer* buffer)
 {
        return buffer->data + buffer->first_free;
 }