Fixed data type for a buffer.

[obnox/wireshark/wip.git] / wiretap / buffer.h

diff --git a/wiretap/buffer.h b/wiretap/buffer.h
index b742e3eb441659e855daa051bd6dc48a3434608b..364088c881c9fce7d77601f274f0140d7088be06 100644 (file)
--- a/wiretap/buffer.h
+++ b/wiretap/buffer.h
@@ -1,20 +1,20 @@
 /* buffer.h
  *
- * $Id: buffer.h,v 1.8 2001/11/13 23:55:43 gram Exp $
+ * $Id$
  *
  * Wiretap Library
  * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
- * 
+ *
  * 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 the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
@@ -26,33 +26,33 @@
 
 #define SOME_FUNCTIONS_ARE_DEFINES
 
-#ifdef HAVE_WINSOCK_H
-#include <winsock.h>        /* to define u_char */
-#endif
-
 typedef struct Buffer {
-       u_char          *data;
-       unsigned int    allocated;
-       unsigned int    start;
-       unsigned int    first_free;
+       guchar  *data;
+       gsize   allocated;
+       gsize   start;
+       gsize   first_free;
 } Buffer;
 
-void buffer_init(Buffer* buffer, unsigned int space);
+void buffer_init(Buffer* buffer, gsize space);
 void buffer_free(Buffer* buffer);
-void buffer_assure_space(Buffer* buffer, unsigned int space);
-void buffer_append(Buffer* buffer, u_char *from, unsigned int bytes);
-void buffer_remove_start(Buffer* buffer, unsigned int bytes);
+void buffer_assure_space(Buffer* buffer, gsize space);
+void buffer_append(Buffer* buffer, guchar *from, gsize bytes);
+void buffer_remove_start(Buffer* buffer, gsize bytes);
 
 #ifdef SOME_FUNCTIONS_ARE_DEFINES
+# define buffer_clean(buffer) buffer_remove_start((buffer), buffer_length(buffer))
 # define buffer_increase_length(buffer,bytes) (buffer)->first_free += (bytes)
 # define buffer_length(buffer) ((buffer)->first_free - (buffer)->start)
 # define buffer_start_ptr(buffer) ((buffer)->data + (buffer)->start)
 # define buffer_end_ptr(buffer) ((buffer)->data + (buffer)->first_free)
+# define buffer_append_buffer(buffer,src_buffer) buffer_append((buffer), buffer_start_ptr(src_buffer), buffer_length(src_buffer))
 #else
+ void buffer_clean(Buffer* buffer);
  void buffer_increase_length(Buffer* buffer, unsigned int bytes);
  unsigned int buffer_length(Buffer* buffer);
- u_char* buffer_start_ptr(Buffer* buffer);
- u_char* buffer_end_ptr(Buffer* buffer);
+ guchar* buffer_start_ptr(Buffer* buffer);
+ guchar* buffer_end_ptr(Buffer* buffer);
+ void buffer_append_buffer(Buffer* buffer, Buffer* src_buffer);
 #endif
 
 #endif