From 83f07d94658e862e86db871e4ad0d60060060f5c Mon Sep 17 00:00:00 2001 From: XANTRONIX Development Date: Sat, 19 Sep 2015 07:17:45 +0000 Subject: [PATCH] Buffer reduction poop --- include/patty/buffer.h | 10 +++++----- src/buffer.c | 18 +----------------- 2 files changed, 6 insertions(+), 22 deletions(-) diff --git a/include/patty/buffer.h b/include/patty/buffer.h index 307c95b..72fbcd5 100644 --- a/include/patty/buffer.h +++ b/include/patty/buffer.h @@ -3,16 +3,16 @@ #include -typedef struct _patty_buffer patty_buffer; +typedef struct _patty_buffer { + void * data; + size_t size; + size_t len; +} patty_buffer; patty_buffer *patty_buffer_new(size_t size); void patty_buffer_destroy(patty_buffer *buffer); -size_t patty_buffer_size(patty_buffer *buffer); - -void *patty_buffer_data(patty_buffer *buffer, size_t *len); - ssize_t patty_buffer_fill(patty_buffer *buffer, void *data, size_t len); void patty_buffer_flush(patty_buffer *buffer, size_t len); diff --git a/src/buffer.c b/src/buffer.c index ccc69c0..13f165a 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -5,12 +5,6 @@ #include -struct _patty_buffer { - void * data; - size_t size; - size_t len; -}; - patty_buffer *patty_buffer_new(size_t size) { patty_buffer *buffer; @@ -39,16 +33,6 @@ void patty_buffer_destroy(patty_buffer *buffer) { free(buffer); } -size_t patty_buffer_size(patty_buffer *buffer) { - return buffer->size; -} - -void *patty_buffer_data(patty_buffer *buffer, size_t *len) { - *len = buffer->len; - - return buffer->data; -} - ssize_t patty_buffer_fill(patty_buffer *buffer, void *data, size_t len) { if (len == 0) { return 0; @@ -60,7 +44,7 @@ ssize_t patty_buffer_fill(patty_buffer *buffer, void *data, size_t len) { goto error_io; } - memcpy(((unsigned char *)buffer->data) + buffer->len, data, len); + memcpy((unsigned char *)buffer->data + buffer->len, data, len); buffer->len += len;