AuxXxilium/kmod
1
0
Fork 0
mirror of https://github.com/AuxXxilium/kmod.git synced 2025-01-23 07:09:40 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

array: avoid duplicate code to reallocate

Browse Source
This commit is contained in:
Lucas De Marchi 2013-11-18 11:28:28 -02:00
parent 9c306bad2e
commit cacbcc4215
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
libkmod/libkmod-array.c
View File

@ -28,6 +28,17 @@
/* basic pointer array growing in steps */
static int array_realloc(struct array *array, size_t new_total)
{
void *tmp = realloc(array->array, sizeof(void *) * new_total);
if (tmp == NULL)
return -ENOMEM;
array->array = tmp;
array->total = new_total;
return 0;
}
void array_init(struct array *array, size_t step)
{
assert(step > 0);
@ -42,13 +53,9 @@ int array_append(struct array *array, const void *element)
size_t idx;
if (array->count + 1 >= array->total) {
size_t new_total = array->total + array->step;
void *tmp = realloc(array->array, sizeof(void *) * new_total);
assert(array->step > 0);
if (tmp == NULL)
return -ENOMEM;
array->array = tmp;
array->total = new_total;
int r = array_realloc(array, array->total + array->step);
if (r < 0)
return r;
}
idx = array->count;
array->array[idx] = (void *)element;
@ -69,13 +76,9 @@ int array_append_unique(struct array *array, const void *element)
void array_pop(struct array *array) {
array->count--;
if (array->count + array->step < array->total) {
size_t new_total = array->total - array->step;
void *tmp = realloc(array->array, sizeof(void *) * new_total);
assert(array->step > 0);
if (tmp == NULL)
int r = array_realloc(array, array->total - array->step);
if (r < 0)
return;
array->array = tmp;
array->total = new_total;
}
}
@ -102,13 +105,10 @@ int array_remove_at(struct array *array, unsigned int pos)
sizeof(void *) * (array->count - pos));
if (array->count + array->step < array->total) {
size_t new_total = array->total - array->step;
void *tmp = realloc(array->array, sizeof(void *) * new_total);
assert(array->step > 0);
if (tmp == NULL)
int r = array_realloc(array, array->total - array->step);
/* ignore error */
if (r < 0)
return 0;
array->array = tmp;
array->total = new_total;
}
return 0;