From 8e48b931091cbc99abeffacc7af80f363495ec23 Mon Sep 17 00:00:00 2001 From: Michael Drake Date: Sat, 14 Dec 2013 23:14:09 +0000 Subject: Remove client allocation function. --- src/utils/buffer.c | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) (limited to 'src/utils/buffer.c') diff --git a/src/utils/buffer.c b/src/utils/buffer.c index 384e9a9..5a2a7ce 100644 --- a/src/utils/buffer.c +++ b/src/utils/buffer.c @@ -14,37 +14,31 @@ /** * Create a memory buffer * - * \param alloc Memory (de)allocation function - * \param pw Pointer to client-specific private data * \param buffer Pointer to location to receive memory buffer * \return PARSERUTILS_OK on success, * PARSERUTILS_BADPARM on bad parameters, * PARSERUTILS_NOMEM on memory exhausion */ -parserutils_error parserutils_buffer_create(parserutils_alloc alloc, void *pw, - parserutils_buffer **buffer) +parserutils_error parserutils_buffer_create(parserutils_buffer **buffer) { parserutils_buffer *b; - if (alloc == NULL || buffer == NULL) + if (buffer == NULL) return PARSERUTILS_BADPARM; - b = alloc(NULL, sizeof(parserutils_buffer), pw); + b = malloc(sizeof(parserutils_buffer)); if (b == NULL) return PARSERUTILS_NOMEM; - b->data = alloc(NULL, DEFAULT_SIZE, pw); + b->data = malloc(DEFAULT_SIZE); if (b->data == NULL) { - alloc(b, 0, pw); + free(b); return PARSERUTILS_NOMEM; } b->length = 0; b->allocated = DEFAULT_SIZE; - b->alloc = alloc; - b->pw = pw; - *buffer = b; return PARSERUTILS_OK; @@ -61,8 +55,8 @@ parserutils_error parserutils_buffer_destroy(parserutils_buffer *buffer) if (buffer == NULL) return PARSERUTILS_BADPARM; - buffer->alloc(buffer->data, 0, buffer->pw); - buffer->alloc(buffer, 0, buffer->pw); + free(buffer->data); + free(buffer); return PARSERUTILS_OK; } @@ -155,8 +149,7 @@ parserutils_error parserutils_buffer_discard(parserutils_buffer *buffer, */ parserutils_error parserutils_buffer_grow(parserutils_buffer *buffer) { - uint8_t *temp = buffer->alloc(buffer->data, - buffer->allocated * 2, buffer->pw); + uint8_t *temp = realloc(buffer->data, buffer->allocated * 2); if (temp == NULL) return PARSERUTILS_NOMEM; @@ -176,7 +169,7 @@ parserutils_error parserutils_buffer_randomise(parserutils_buffer *buffer) return PARSERUTILS_BADPARM; #ifndef NDEBUG - temp = buffer->alloc(NULL, buffer->allocated, buffer->pw); + temp = malloc(buffer->allocated); if (temp == NULL) return PARSERUTILS_NOMEM; -- cgit v1.2.3