Index: fusl/src/regex/tre-mem.c |
diff --git a/fusl/src/regex/tre-mem.c b/fusl/src/regex/tre-mem.c |
index 86f809d45564ee3190be8d65aac328f97f2882b4..02a6edb3bea13a2d69858c89c6021462b104aead 100644 |
--- a/fusl/src/regex/tre-mem.c |
+++ b/fusl/src/regex/tre-mem.c |
@@ -49,98 +49,82 @@ |
*/ |
/* Returns a new memory allocator or NULL if out of memory. */ |
-tre_mem_t |
-tre_mem_new_impl(int provided, void *provided_block) |
-{ |
+tre_mem_t tre_mem_new_impl(int provided, void* provided_block) { |
tre_mem_t mem; |
- if (provided) |
- { |
- mem = provided_block; |
- memset(mem, 0, sizeof(*mem)); |
- } |
- else |
+ if (provided) { |
+ mem = provided_block; |
+ memset(mem, 0, sizeof(*mem)); |
+ } else |
mem = xcalloc(1, sizeof(*mem)); |
if (mem == NULL) |
return NULL; |
return mem; |
} |
- |
/* Frees the memory allocator and all memory allocated with it. */ |
-void |
-tre_mem_destroy(tre_mem_t mem) |
-{ |
+void tre_mem_destroy(tre_mem_t mem) { |
tre_list_t *tmp, *l = mem->blocks; |
- while (l != NULL) |
- { |
- xfree(l->data); |
- tmp = l->next; |
- xfree(l); |
- l = tmp; |
- } |
+ while (l != NULL) { |
+ xfree(l->data); |
+ tmp = l->next; |
+ xfree(l); |
+ l = tmp; |
+ } |
xfree(mem); |
} |
- |
/* Allocates a block of `size' bytes from `mem'. Returns a pointer to the |
allocated block or NULL if an underlying malloc() failed. */ |
-void * |
-tre_mem_alloc_impl(tre_mem_t mem, int provided, void *provided_block, |
- int zero, size_t size) |
-{ |
- void *ptr; |
- |
- if (mem->failed) |
- { |
- return NULL; |
- } |
- |
- if (mem->n < size) |
- { |
- /* We need more memory than is available in the current block. |
- Allocate a new block. */ |
- tre_list_t *l; |
- if (provided) |
- { |
- if (provided_block == NULL) |
- { |
- mem->failed = 1; |
- return NULL; |
- } |
- mem->ptr = provided_block; |
- mem->n = TRE_MEM_BLOCK_SIZE; |
- } |
+void* tre_mem_alloc_impl(tre_mem_t mem, |
+ int provided, |
+ void* provided_block, |
+ int zero, |
+ size_t size) { |
+ void* ptr; |
+ |
+ if (mem->failed) { |
+ return NULL; |
+ } |
+ |
+ if (mem->n < size) { |
+ /* We need more memory than is available in the current block. |
+ Allocate a new block. */ |
+ tre_list_t* l; |
+ if (provided) { |
+ if (provided_block == NULL) { |
+ mem->failed = 1; |
+ return NULL; |
+ } |
+ mem->ptr = provided_block; |
+ mem->n = TRE_MEM_BLOCK_SIZE; |
+ } else { |
+ int block_size; |
+ if (size * 8 > TRE_MEM_BLOCK_SIZE) |
+ block_size = size * 8; |
else |
- { |
- int block_size; |
- if (size * 8 > TRE_MEM_BLOCK_SIZE) |
- block_size = size * 8; |
- else |
- block_size = TRE_MEM_BLOCK_SIZE; |
- l = xmalloc(sizeof(*l)); |
- if (l == NULL) |
- { |
- mem->failed = 1; |
- return NULL; |
- } |
- l->data = xmalloc(block_size); |
- if (l->data == NULL) |
- { |
- xfree(l); |
- mem->failed = 1; |
- return NULL; |
- } |
- l->next = NULL; |
- if (mem->current != NULL) |
- mem->current->next = l; |
- if (mem->blocks == NULL) |
- mem->blocks = l; |
- mem->current = l; |
- mem->ptr = l->data; |
- mem->n = block_size; |
- } |
+ block_size = TRE_MEM_BLOCK_SIZE; |
+ l = xmalloc(sizeof(*l)); |
+ if (l == NULL) { |
+ mem->failed = 1; |
+ return NULL; |
+ } |
+ l->data = xmalloc(block_size); |
+ if (l->data == NULL) { |
+ xfree(l); |
+ mem->failed = 1; |
+ return NULL; |
+ } |
+ l->next = NULL; |
+ if (mem->current != NULL) |
+ mem->current->next = l; |
+ if (mem->blocks == NULL) |
+ mem->blocks = l; |
+ mem->current = l; |
+ mem->ptr = l->data; |
+ mem->n = block_size; |
} |
+ } |
/* Make sure the next pointer will be aligned. */ |
size += ALIGN(mem->ptr + size, long); |