diff --git a/src/lib/list.c b/src/lib/list.c index 50858a1..ace0c2c 100644 --- a/src/lib/list.c +++ b/src/lib/list.c @@ -43,6 +43,19 @@ int list_size(const void *list_ptr) { return list->size; } +int list_find(void *list_ptr, void *elem) { + list_meta_t *list = (void *) ((unsigned char *) list_ptr - sizeof(list_meta_t)); + unsigned char *array = list_ptr; + + for (int i = 0; i < list->size; i++) { + if (memcmp(array + i * list->elem_size, elem, list->elem_size) == 0) { + return i; + } + } + + return -1; +} + void *list_insert(void *list_ptr, void *elem, int n) { void *ptr = NULL; list_ptr = list_insert_ptr(list_ptr, &ptr, n); @@ -94,7 +107,7 @@ void *list_remove(void *list_ptr, int n) { memmove(array + n * list->elem_size, array + (n + 1) * list->elem_size, (list->size - n - 1) * list->elem_size); list->size--; - if (list->size < list->max_size / FACTOR && list->max_size / FACTOR >= list->init_size) { + if (list->size < list->max_size / FACTOR / 2 && list->max_size / FACTOR >= list->init_size) { if ((list = list_resize(list, list->max_size / FACTOR)) == NULL) { return NULL; } @@ -103,6 +116,15 @@ void *list_remove(void *list_ptr, int n) { return (unsigned char *) list + sizeof(list_meta_t); } +void *list_delete(void *list_ptr, void *elem) { + int idx = list_find(list_ptr, elem); + if (idx == -1) { + return list_ptr; + } else { + return list_remove(list_ptr, idx); + } +} + void *list_clear(void *list_ptr) { list_meta_t *list = (void *) ((unsigned char *) list_ptr - sizeof(list_meta_t)); list->size = 0; diff --git a/src/lib/list.h b/src/lib/list.h index 0d29c59..d778a48 100644 --- a/src/lib/list.h +++ b/src/lib/list.h @@ -6,6 +6,8 @@ void *list_create(int elem_size, int init_elem_n); int list_size(const void *list_ptr); +int list_find(void *list_ptr, void *elem); + void *list_insert(void *list_ptr, void *elem, int n); void *list_insert_ptr(void *list_ptr, void **elem, int n); @@ -16,6 +18,8 @@ void *list_append_ptr(void *list_ptr, void **elem); void *list_remove(void *list_ptr, int n); +void *list_delete(void *list_ptr, void *elem); + void *list_clear(void *list_ptr); void list_free(void *list_ptr);