From 5254df0466fd8213905b52f7f6a0ab6c2c8cc862 Mon Sep 17 00:00:00 2001 From: Jeff Lenk Date: Tue, 4 Jan 2011 22:57:49 -0600 Subject: [PATCH] FS-2957 esl lib on windows fails to build --- libs/esl/src/esl_buffer.c | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/libs/esl/src/esl_buffer.c b/libs/esl/src/esl_buffer.c index 8032169fe3..7ba3d5265d 100644 --- a/libs/esl/src/esl_buffer.c +++ b/libs/esl/src/esl_buffer.c @@ -83,6 +83,9 @@ ESL_DECLARE(esl_size_t) esl_buffer_len(esl_buffer_t *buffer) { assert(buffer != NULL); + if (!buffer){ + return (esl_size_t)NULL; + } return buffer->datalen; @@ -92,7 +95,9 @@ ESL_DECLARE(esl_size_t) esl_buffer_len(esl_buffer_t *buffer) ESL_DECLARE(esl_size_t) esl_buffer_freespace(esl_buffer_t *buffer) { assert(buffer != NULL); - + if (!buffer) { + return (esl_size_t)NULL; + } if (buffer->max_len) { return (esl_size_t) (buffer->max_len - buffer->used); @@ -104,6 +109,9 @@ ESL_DECLARE(esl_size_t) esl_buffer_freespace(esl_buffer_t *buffer) ESL_DECLARE(esl_size_t) esl_buffer_inuse(esl_buffer_t *buffer) { assert(buffer != NULL); + if (!buffer) { + return (esl_size_t)NULL; + } return buffer->used; } @@ -113,6 +121,9 @@ ESL_DECLARE(esl_size_t) esl_buffer_seek(esl_buffer_t *buffer, esl_size_t datalen esl_size_t reading = 0; assert(buffer != NULL); + if (!buffer) { + return (esl_size_t)NULL; + } if (buffer->used < 1) { buffer->used = 0; @@ -134,6 +145,9 @@ ESL_DECLARE(esl_size_t) esl_buffer_toss(esl_buffer_t *buffer, esl_size_t datalen esl_size_t reading = 0; assert(buffer != NULL); + if (!buffer) { + return (esl_size_t)NULL; + } if (buffer->used < 1) { buffer->used = 0; @@ -175,6 +189,9 @@ ESL_DECLARE(esl_size_t) esl_buffer_read(esl_buffer_t *buffer, void *data, esl_si esl_size_t reading = 0; assert(buffer != NULL); + if (!buffer) { + return (esl_size_t)NULL; + } assert(data != NULL); @@ -252,6 +269,9 @@ ESL_DECLARE(esl_size_t) esl_buffer_write(esl_buffer_t *buffer, const void *data, esl_size_t freespace, actual_freespace; assert(buffer != NULL); + if (!buffer) { + return (esl_size_t)NULL; + } assert(data != NULL); assert(buffer->data != NULL); @@ -313,6 +333,9 @@ ESL_DECLARE(esl_size_t) esl_buffer_write(esl_buffer_t *buffer, const void *data, ESL_DECLARE(void) esl_buffer_zero(esl_buffer_t *buffer) { assert(buffer != NULL); + if (!buffer) { + return; + } assert(buffer->data != NULL); buffer->used = 0;