diff options
author | Guy Harris <guy@alum.mit.edu> | 2009-03-07 04:47:06 +0000 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2009-03-07 04:47:06 +0000 |
commit | e6ccfc6944495314302a64ce92375130ea64dc10 (patch) | |
tree | 7f1865de303acd667941be0dea939d80ef64fda8 /wiretap | |
parent | 76582cf2e2383d23ecfb7bd90fb76d808873d69a (diff) |
More P64 stuff.
svn path=/trunk/; revision=27636
Diffstat (limited to 'wiretap')
-rw-r--r-- | wiretap/buffer.c | 5 | ||||
-rw-r--r-- | wiretap/buffer.h | 8 |
2 files changed, 7 insertions, 6 deletions
diff --git a/wiretap/buffer.c b/wiretap/buffer.c index 09ef1993a0..f7f977c06f 100644 --- a/wiretap/buffer.c +++ b/wiretap/buffer.c @@ -97,8 +97,9 @@ void buffer_append(Buffer* buffer, guchar *from, gsize 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); + 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); exit(1); } buffer->start += bytes; diff --git a/wiretap/buffer.h b/wiretap/buffer.h index 95080ad363..364088c881 100644 --- a/wiretap/buffer.h +++ b/wiretap/buffer.h @@ -27,10 +27,10 @@ #define SOME_FUNCTIONS_ARE_DEFINES typedef struct Buffer { - guchar *data; - gsize allocated; - unsigned int start; - unsigned int first_free; + guchar *data; + gsize allocated; + gsize start; + gsize first_free; } Buffer; void buffer_init(Buffer* buffer, gsize space); |