sani7/c-libs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Memory optimize the 1d and 2d arrays

Browse Source
This commit is contained in:
Sander Speetjens
2023-11-04 16:48:14 +01:00
parent 75b8cfe46b
commit d03ca99438
2 changed files with 8 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/safe_array.c
View File

@@ -21,19 +21,12 @@
*/
array_t *array_init(size_t size, size_t rows)
{
array_t *arr = calloc(sizeof(array_t), 1);
array_t *arr = calloc(sizeof(array_t) + (size * rows), 1);
if (!arr)
{
fprintf(stderr, "%s: Failed to allocate memory for array", __func__);
return NULL;
}
arr->data = calloc(size, rows);
if (!arr->data)
{
fprintf(stderr, "%s: Failed to allocate memory for data", __func__);
free(arr);
return NULL;
}
arr->rows = rows;
arr->size = size;
@@ -103,7 +96,6 @@ void array_free(array_t *arr)
{
fprintf(stderr, "%s: ptr dereferences to NULL\n", __func__);
}
free(arr->data);
free(arr);
}
@@ -117,19 +109,12 @@ void array_free(array_t *arr)
*/
array_2d_t *array_2d_init(size_t size, size_t rows, size_t cols)
{
array_2d_t *arr = calloc(sizeof(array_2d_t), 1);
array_2d_t *arr = calloc(sizeof(array_2d_t) + (size * rows * cols), 1);
if (!arr)
{
fprintf(stderr, "%s: Failed to allocate memory for array", __func__);
return NULL;
}
arr->data = calloc(size, rows * cols);
if (!arr->data)
{
fprintf(stderr, "%s: Failed to allocate memory for data", __func__);
free(arr);
return NULL;
}
arr->rows = rows;
arr->cols = cols;
@@ -205,7 +190,6 @@ void array_2d_free(array_2d_t *x)
{
fprintf(stderr, "%s: ptr dereferences to NULL\n", __func__);
}
free(x->data);
free(x);
}