diff options
| author | Paul Buetow <paul@buetow.org> | 2008-11-04 21:29:33 +0000 |
|---|---|---|
| committer | Paul Buetow <paul@buetow.org> | 2008-11-04 21:29:33 +0000 |
| commit | 37c687c229f89202e5625bc3d3f9b1c85cb94b51 (patch) | |
| tree | d479b5a573854192f6a8703fe5f1c4bde6dae5fc /src/data | |
| parent | ff0828f06a1f317681c45402feda48bde592a076 (diff) | |
array_delete_iterate implemented..
Diffstat (limited to 'src/data')
| -rw-r--r-- | src/data/array.c | 17 | ||||
| -rw-r--r-- | src/data/array.h | 1 |
2 files changed, 18 insertions, 0 deletions
diff --git a/src/data/array.c b/src/data/array.c index 6a2b1fa..553d6f5 100644 --- a/src/data/array.c +++ b/src/data/array.c @@ -84,6 +84,23 @@ array_delete(Array *p_array) { } void +array_delete_iterate(Array *p_array, void (*func)(void *)) { + if (!p_array) + return; + + array_iterate(p_array, func); + + if (p_array->i_size) + for (int i = p_array->i_size - 1; i >= 0; --i) + arrayelement_delete(p_array->pp_ae[i]); + + if (p_array->pp_ae) + free(p_array->pp_ae); + + free(p_array); +} + +void array_set(Array *p_array, int i_index, void *p_val) { if (p_array->i_size > i_index) { p_array->pp_ae[i_index]->p_val = p_val; diff --git a/src/data/array.h b/src/data/array.h index 75f6365..14e3851 100644 --- a/src/data/array.h +++ b/src/data/array.h @@ -64,6 +64,7 @@ Array *array_new(); Array *array_new_size(int i_size); Array *array_new_copy(Array *p_array); void array_delete(Array *p_array); +void array_delete_iterate(Array *p_array, void (*func)(void*)); void array_set(Array *p_array, int i_index, void *p_val); void array_insert(Array *p_array, int i_index, void *p_val); void *array_remove(Array *p_array, int i_index); |
