3rd-party/libfort
1
0
Fork 0
Code Releases Activity

[C] Changed memory functions

Browse Source
This commit is contained in:
seleznevae 2018-04-01 19:10:43 +03:00
parent 57e0d9d58e
commit b938a0749d
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/vector.c
View File

@ -19,7 +19,7 @@ static int vector_reallocate_(vector_t *vector, size_t new_capacity)
assert(new_capacity > vector->m_capacity); assert(new_capacity > vector->m_capacity);
size_t new_size = new_capacity * vector->m_item_size; size_t new_size = new_capacity * vector->m_item_size;
vector->m_data = realloc(vector->m_data, new_size); vector->m_data = F_REALLOC(vector->m_data, new_size);
if (vector->m_data == NULL) if (vector->m_data == NULL)
return -1; return -1;
return 0; return 0;
@ -29,17 +29,17 @@ static int vector_reallocate_(vector_t *vector, size_t new_capacity)
vector_t *create_vector(size_t item_size, size_t capacity) vector_t *create_vector(size_t item_size, size_t capacity)
{ {
vector_t *vector = (vector_t *)malloc(sizeof(vector_t)); vector_t *vector = (vector_t *)F_MALLOC(sizeof(vector_t));
if (vector == NULL) { if (vector == NULL) {
SYS_LOG_ERROR("Failed to allocate memory for asock vector"); SYS_LOG_ERROR("Failed to allocate memory for asock vector");
return NULL; return NULL;
} }
size_t init_size = MAX(item_size * capacity, 1); size_t init_size = MAX(item_size * capacity, 1);
vector->m_data = malloc(init_size); vector->m_data = F_MALLOC(init_size);
if (vector->m_data == NULL) { if (vector->m_data == NULL) {
SYS_LOG_ERROR("Failed to allocate memory for asock vector inern. buffer"); SYS_LOG_ERROR("Failed to allocate memory for asock vector inern. buffer");
free(vector); F_FREE(vector);
return NULL; return NULL;
} }
@ -54,8 +54,8 @@ vector_t *create_vector(size_t item_size, size_t capacity)
void destroy_vector(vector_t *vector) void destroy_vector(vector_t *vector)
{ {
assert(vector); assert(vector);
free(vector->m_data); F_FREE(vector->m_data);
free(vector); F_FREE(vector);
} }
vector_t *copy_vector(vector_t *v) vector_t *copy_vector(vector_t *v)