/* buffer.c
*
- * $Id: buffer.c,v 1.13 2002/07/29 06:09:58 guy 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.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include <stdio.h>
#include <stdlib.h>
#include "buffer.h"
/* Initializes a buffer with a certain amount of allocated space */
-void buffer_init(Buffer* buffer, unsigned int 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;
so that another routine can copy directly into the buffer space. After
doing that, the routine will also want to run
buffer_increase_length(). */
-void buffer_assure_space(Buffer* buffer, unsigned int space)
+void buffer_assure_space(Buffer* buffer, gsize space)
{
- unsigned int available_at_end = buffer->allocated - buffer->first_free;
- unsigned int space_used;
- int space_at_beginning;
+ gsize available_at_end = buffer->allocated - buffer->first_free;
+ gsize space_used;
+ gboolean space_at_beginning;
/* If we've got the space already, good! */
if (space <= available_at_end) {
/* 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, unsigned int bytes)
+void buffer_append(Buffer* buffer, guint8 *from, gsize bytes)
{
buffer_assure_space(buffer, bytes);
memcpy(buffer->data + buffer->first_free, from, bytes);
buffer->first_free += bytes;
}
-void buffer_remove_start(Buffer* buffer, unsigned int bytes)
+void buffer_remove_start(Buffer* buffer, gsize bytes)
{
if (buffer->start + bytes > buffer->first_free) {
- g_error("buffer_remove_start trying to remove %d bytes. s=%d ff=%d!\n",
- bytes, buffer->start, buffer->first_free);
- exit(1);
+ g_error("buffer_remove_start trying to remove %" G_GINT64_MODIFIER "u bytes. s=%" G_GINT64_MODIFIER "u ff=%" G_GINT64_MODIFIER "u!\n",
+ (guint64)bytes, (guint64)buffer->start,
+ (guint64)buffer->first_free);
+ /** g_error() does an abort() and thus never returns **/
}
buffer->start += bytes;
#ifndef SOME_FUNCTIONS_ARE_DEFINES
-void buffer_increase_length(Buffer* buffer, unsigned int bytes)
+void buffer_clean(Buffer* buffer)
+{
+ buffer_remove_start(buffer, buffer_length(buffer));
+}
+#endif
+
+#ifndef SOME_FUNCTIONS_ARE_DEFINES
+void buffer_increase_length(Buffer* buffer, gsize bytes)
{
buffer->first_free += bytes;
}
#endif
#ifndef SOME_FUNCTIONS_ARE_DEFINES
-unsigned int buffer_length(Buffer* buffer)
+gsize buffer_length(Buffer* buffer)
{
return buffer->first_free - buffer->start;
}
#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;
}
#endif
+
+#ifndef SOME_FUNCTIONS_ARE_DEFINES
+void buffer_append_buffer(Buffer* buffer, Buffer* src_buffer)
+{
+ buffer_append(buffer, buffer_start_ptr(src_buffer), buffer_length(src_buffer));
+}
+#endif