aniani/icecast-common
1
0
Fork 0
mirror of https://gitlab.xiph.org/xiph/icecast-common.git synced 2025-02-02 15:07:47 -05:00
Code

Feature: Added igloo_list_remove()

Browse Source
This commit is contained in:
Philipp Schafft 2019-09-11 10:27:15 +00:00
parent 0d86c455e4
commit 729c89939e
4 changed files with 66 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/igloo/list.h
View File

@ -79,6 +79,12 @@ igloo_ro_t igloo_list_pop(igloo_list_t *list);
/* Merge the content of the list elements into the list list. The list elements is not changed. */
int igloo_list_merge(igloo_list_t *list, igloo_list_t *elements);
/* Remove a single element from the list.
* Note: This is not very efficient as the list is first searched for the element
* and then reorganized so there is no gap.
*/
int igloo_list_remove(igloo_list_t *list, igloo_ro_t element);
/* Creates a new iterator that can be used to walk the list.
* The memory pointed to by storage of size storage_length is used to store the iterator's internal
* values. It must be allocated (e.g. on stack) untill igloo_list_iterator_end() is called.

2
include/igloo/ro.h
View File

@ -273,6 +273,8 @@ int igloo_RO_IS_VALID_raw(igloo_ro_t object, const igloo_ro_type_t *
int igloo_RO_HAS_TYPE_raw(igloo_ro_t object, const igloo_ro_type_t *type);
#define igloo_RO_HAS_TYPE(x,type) igloo_RO_HAS_TYPE_raw((x), (type))
#define igloo_RO_IS_SAME(a,b) (igloo_RO__GETBASE((a)) == igloo_RO__GETBASE((b)))
/* Create a new refobject
* The type argument gives the type for the new object,
* the name for the object is given by name, and

19
src/list.c
View File

@ -394,6 +394,25 @@ int igloo_list_merge(igloo_list_t *list, igloo_list_t *eleme
return 0;
}
int igloo_list_remove(igloo_list_t *list, igloo_ro_t element)
{
size_t i;
if (!igloo_RO_IS_VALID(list, igloo_list_t) || igloo_RO_IS_NULL(element))
return -1;
for (i = list->offset; i < list->fill; i++) {
if (igloo_RO_IS_SAME(list->elements[i], element)) {
igloo_ro_unref(list->elements[i]);
memmove(list->elements + i, list->elements + i + 1, (list->fill - i - 1)*sizeof(*list->elements));
list->fill--;
return 0;
}
}
return -1;
}
igloo_list_iterator_t * igloo_list_iterator_start(igloo_list_t *list, void *storage, size_t storage_length)
{
igloo_list_iterator_t *iterator;

39
src/tests/ctest_list.c
View File

@ -550,6 +550,43 @@ static void test_list_policy_fixed_pipe_merge(void) {
ctest_test("un-referenced dstlist", igloo_ro_unref(dstlist) == 0);
}
static void test_list_remove(void) {
igloo_list_t *list;
igloo_ro_base_t *element;
igloo_ro_base_t *second_element = NULL;
size_t i;
size_t count = 0;
list = igloo_ro_new(igloo_list_t);
ctest_test("list created", !igloo_RO_IS_NULL(list));
for (i = 0; i < 4; i++) {
element = igloo_ro_new(igloo_ro_base_t);
ctest_test("test object created", !igloo_RO_IS_NULL(element));
ctest_test("test object pushed", igloo_list_push(list, element) == 0);
if (i == 1) {
second_element = element;
ctest_test("referenced 2nd test object", igloo_ro_ref(second_element) == 0);
}
ctest_test("un-referenced test object", igloo_ro_unref(element) == 0);
}
ctest_test("2nd element was removed", igloo_list_remove(list, second_element) == 0);
igloo_list_foreach(list, igloo_ro_base_t, ret, {
ctest_test("Returned element is valid", igloo_RO_IS_VALID(ret, igloo_ro_base_t));
ctest_test("Returned element is not same as 2nd element", !igloo_RO_IS_SAME(ret, second_element));
count++;
});
ctest_test("Number of returned elements is correct", count == 3);
ctest_test("un-referenced 2nd test object", igloo_ro_unref(second_element) == 0);
ctest_test("un-referenced list", igloo_ro_unref(list) == 0);
}
int main (void)
{
ctest_init();
@ -578,6 +615,8 @@ int main (void)
test_list_policy_fixed_pipe_unshift();
test_list_policy_fixed_pipe_merge();
test_list_remove();
ctest_fin();
return 0;