X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/cb9c6b049a77ae4d71d2d8314a084294b760ed91..0e8f25088a5fcac96419b8243a2838acd637fa88:/win32_test_app/src/TBuffer.c diff --git a/win32_test_app/src/TBuffer.c b/win32_test_app/src/TBuffer.c index d7a6ccef26..cd41e18622 100644 --- a/win32_test_app/src/TBuffer.c +++ b/win32_test_app/src/TBuffer.c @@ -9,74 +9,70 @@ */ Buffer_t Buffer_new(void) { - Buffer_t buffer = (Buffer_t)calloc(1,sizeof(s_Buffer_t)); - - if(NULL == buffer) - { - setErrno(E_BUFFER_ALLOCATION_FAILED); - return NULL; - } - - buffer->data = (char*)calloc(1,DEFAULT_Buffer_CAPACITY); - - - if(NULL == buffer->data) - { - Buffer_free(buffer); - setErrno(E_BUFFER_DATA_ALLOCATION_FAILED); - return NULL; - } - - buffer->capacity = DEFAULT_Buffer_CAPACITY; - Buffer_clear(buffer); - return buffer; + Buffer_t buffer = (Buffer_t) calloc(1, sizeof(s_Buffer_t)); + + if (NULL == buffer) { + setErrno(E_BUFFER_ALLOCATION_FAILED); + return NULL; + } + + buffer->data = (char *) calloc(1, DEFAULT_Buffer_CAPACITY); + + + if (NULL == buffer->data) { + Buffer_free(buffer); + setErrno(E_BUFFER_DATA_ALLOCATION_FAILED); + return NULL; + } + + buffer->capacity = DEFAULT_Buffer_CAPACITY; + Buffer_clear(buffer); + return buffer; } /* Clears the buffer (this function don't destroy it, * see Buffer_free function.). - */ + */ void Buffer_clear(Buffer_t buffer) { - /* must be a valid buffer. */ - ASSERT_VALID_Buffer(buffer); - - buffer->size = 0; - buffer->data[0]='\n'; - buffer->data[1]='\0'; + /* must be a valid buffer. */ + ASSERT_VALID_Buffer(buffer); + + buffer->size = 0; + buffer->data[0] = '\n'; + buffer->data[1] = '\0'; } /* Appends a string in the buffer. If successful, * the function returns true. Otherwise the function * returns false. */ -bool Buffer_append(Buffer_t buffer,char* str) +bool Buffer_append(Buffer_t buffer, char *str) { - size_t len= strlen(str); - size_t capacity_needed = buffer->size + len + 1; - size_t capacity_available = buffer->capacity - buffer->size; - - /* must be a valid buffer. */ - ASSERT_VALID_Buffer(buffer); - /* must be a valid string. */ - ASSERT_NOT_NULL(str); - - if(capacity_available < capacity_needed) - { - buffer->data = (char*)realloc(buffer->data, capacity_needed); - - if(NULL == buffer->data) - { - setErrno(E_Buffer_DATA_REALLOCATION_FAILED); - return false; - } - - buffer->capacity = capacity_needed; - } - - strcpy(buffer->data + buffer->size,str); - buffer->size += len;/* + 1*/ ; - - return true; + size_t len = strlen(str); + size_t capacity_needed = buffer->size + len + 1; + size_t capacity_available = buffer->capacity - buffer->size; + + /* must be a valid buffer. */ + ASSERT_VALID_Buffer(buffer); + /* must be a valid string. */ + ASSERT_NOT_NULL(str); + + if (capacity_available < capacity_needed) { + buffer->data = (char *) realloc(buffer->data, capacity_needed); + + if (NULL == buffer->data) { + setErrno(E_Buffer_DATA_REALLOCATION_FAILED); + return false; + } + + buffer->capacity = capacity_needed; + } + + strcpy(buffer->data + buffer->size, str); + buffer->size += len; /* + 1 */ ; + + return true; } /* @@ -84,16 +80,16 @@ bool Buffer_append(Buffer_t buffer,char* str) */ void Buffer_chomp(Buffer_t buffer) { - /* must be a valid buffer. */ - ASSERT_VALID_Buffer(buffer); - - while ((buffer->data[buffer->size-1] == '\n') || (buffer->data[buffer->size-1] == '\r')) - { - buffer->data[buffer->size-1] = '\0'; - - if(buffer->size) - (buffer->size)--; - } + /* must be a valid buffer. */ + ASSERT_VALID_Buffer(buffer); + + while ((buffer->data[buffer->size - 1] == '\n') + || (buffer->data[buffer->size - 1] == '\r')) { + buffer->data[buffer->size - 1] = '\0'; + + if (buffer->size) + (buffer->size)--; + } } /* @@ -101,23 +97,21 @@ void Buffer_chomp(Buffer_t buffer) */ void Buffer_free(Buffer_t buffer) { - if(NULL == buffer) - return; - - if(NULL != buffer->data) - free(buffer->data); - - if(NULL != buffer) - free(buffer); + if (NULL == buffer) + return; + + free(buffer->data); + + free(buffer); } /* * This function returns true is the buffer is empty. * Otherwrise the function returns false. */ -bool Buffer_empty(Buffer_t buffer) +bool Buffer_empty(Buffer_t buffer) { - /* must be a valid buffer. */ - ASSERT_VALID_Buffer(buffer); - return (buffer->size) == 0; + /* must be a valid buffer. */ + ASSERT_VALID_Buffer(buffer); + return (buffer->size) == 0; }