JIANG/EPANET
1
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases Wiki Activity

Fixing bug in head_list

Browse Source
This commit is contained in:
Michael Tryby
2019-04-09 18:09:41 -04:00
parent 1fdee6ac7e
commit 07995beda1
3 changed files with 37 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/util/list.c
View File

@@ -95,17 +95,23 @@ void for_each_list(list_t *list, listIterator iterator)
}
}
void head_list(list_t *list, void *element, bool removeFromList)
void head_list(list_t *list, void **element, bool removeFromList)
{
assert(list->head != NULL);
listNode *node = list->head;
listNode *node = list->head;
memcpy(element, node->data, list->elementSize);
*element = (void *)malloc(list->elementSize);
memcpy(*element, node->data, list->elementSize);
if(removeFromList) {
list->head = node->next;
list->logicalLength--;
if (list->freeFn) {
list->freeFn(node->data);
}
free(node->data);
free(node);
}

2
src/util/list.h
View File

@@ -76,7 +76,7 @@ void for_each_list(list_t *list, listIterator iterator);
/**
@brief Returns the head of the list (optionally removing it at the same time).
*/
void head_list(list_t *list, void *element, bool removeFromList);
void head_list(list_t *list, void **element, bool removeFromList);
/**
@brief Returns the tail of the list.

27
tests/util/test_list.cpp
View File

@@ -88,4 +88,31 @@ BOOST_AUTO_TEST_CASE(test_string_list) {
}
BOOST_AUTO_TEST_CASE(test_head_list) {
int i, numNames = 5;
const char *names[] = { "David", "Kevin", "Michael", "Craig", "Jimi" };
list_t *list = NULL;
list = create_list(sizeof(char *), free_string);
char *name;
for (i = 0; i < numNames; i++) {
name = _strdup(names[i]);
append_list(list, &name);
}
BOOST_CHECK(size_list(list) == 5);
char *temp = NULL;
head_list(list, &(void *)temp, true);
name = *(char **)temp;
BOOST_CHECK(size_list(list) == 4);
free(temp);
delete_list(list);
}
BOOST_AUTO_TEST_SUITE_END()