ims-volte-vowifi
/
strongswan
9
0
Fork 0
Code Pull Requests Releases Activity

- moved remove-method to iterator

This commit is contained in:
Martin Willi 2005-11-24 12:06:23 +00:00
parent 4ed9966524
commit 12c3e4c860
5 changed files with 80 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/charon/sa/ike_sa_manager.c
View File

@ -335,7 +335,7 @@ static status_t delete_entry(private_ike_sa_manager_t *this, ike_sa_entry_t *ent
if (current == entry)
{
this->logger->log(this->logger,CONTROL | MOST,"Found entry by pointer. Going to delete it.");
list->remove(list, iterator);
iterator->remove(iterator);
entry->destroy(entry);
status = SUCCESS;
break;

2
Source/charon/testcases/linked_list_test.c
View File

@ -190,7 +190,7 @@ void test_linked_list_insert_and_remove(tester_t *tester)
tester->assert_true(tester,(strcmp((char *) value,"three") == 0), "current value check");
tester->assert_true(tester,(linked_list->remove(linked_list,iterator) == SUCCESS), "remove call check");
tester->assert_true(tester,(iterator->remove(iterator) == SUCCESS), "remove call check");
iterator->current(iterator,&value);
tester->assert_true(tester,(strcmp((char *) value,"before_three") == 0), "current value check");

127
Source/charon/utils/linked_list.c
View File

@ -537,6 +537,69 @@ static status_t insert_after(private_linked_list_iterator_t * iterator, void *it
return SUCCESS;
}
/**
* @brief implements function remove of linked_list_t.
*/
static status_t remove(private_linked_list_iterator_t *this)
{
linked_list_element_t *new_current;
if (this->current == NULL)
{
return FAILED;
}
if (this->list->count == 0)
{
return FAILED;
}
/* find out the new iterator position */
if (this ->current->previous != NULL)
{
new_current = this->current->previous;
}
else if (this->current->next != NULL)
{
new_current = this->current->next;
}
else
{
new_current = NULL;
}
/* now delete the entry :-) */
if (this->current->previous == NULL)
{
if (this->current->next == NULL)
{
this->list->first = NULL;
this->list->last = NULL;
}
else
{
this->current->next->previous = NULL;
this->list->first = this->current->next;
}
}
else if (this->current->next == NULL)
{
this->current->previous->next = NULL;
this->list->last = this->current->previous;
}
else
{
this->current->previous->next = this->current->next;
this->current->next->previous = this->current->previous;
}
this->list->count--;
this->current->destroy(this->current);
/* set the new iterator position */
this->current = new_current;
return SUCCESS;
}
static status_t create_iterator (private_linked_list_t *linked_list, linked_list_iterator_t **iterator,bool forward)
{
private_linked_list_iterator_t *this = allocator_alloc_thing(private_linked_list_iterator_t);
@ -550,6 +613,7 @@ static status_t create_iterator (private_linked_list_t *linked_list, linked_list
this->public.current = (status_t (*) (linked_list_iterator_t *this, void **value)) iterator_current;
this->public.insert_before = (status_t (*) (linked_list_iterator_t *this, void *item)) insert_before;
this->public.insert_after = (status_t (*) (linked_list_iterator_t *this, void *item)) insert_after;
this->public.remove = (status_t (*) (linked_list_iterator_t *this)) remove;
this->public.reset = (status_t (*) (linked_list_iterator_t *this)) iterator_reset;
this->public.destroy = (status_t (*) (linked_list_iterator_t *this)) iterator_destroy;
@ -563,68 +627,6 @@ static status_t create_iterator (private_linked_list_t *linked_list, linked_list
return (SUCCESS);
}
/**
* @brief implements function remove of linked_list_t
*/
static status_t linked_list_remove(private_linked_list_t *this, private_linked_list_iterator_t * iterator)
{
linked_list_element_t *new_current;
if ((this == NULL) || (iterator == NULL) || (iterator->current == NULL))
{
return FAILED;
}
if (this->count == 0)
{
return FAILED;
}
/* find out the new iterator position */
if (iterator->current->previous != NULL)
{
new_current = iterator->current->previous;
}
else if (iterator->current->next != NULL)
{
new_current = iterator->current->next;
}
else
{
new_current = NULL;
}
/* now delete the entry :-) */
if (iterator->current->previous == NULL)
{
if (iterator->current->next == NULL)
{
this->first = NULL;
this->last = NULL;
}
else
{
iterator->current->next->previous = NULL;
this->first = iterator->current->next;
}
}
else if (iterator->current->next == NULL)
{
iterator->current->previous->next = NULL;
this->last = iterator->current->previous;
}
else
{
iterator->current->previous->next = iterator->current->next;
iterator->current->next->previous = iterator->current->previous;
}
this->count--;
iterator->current->destroy(iterator->current);
/* set the new iterator position */
iterator->current = new_current;
return SUCCESS;
}
/**
* @brief implements function destroy of linked_list_t
*/
@ -664,7 +666,6 @@ linked_list_t *linked_list_create()
this->public.get_last = (status_t (*) (linked_list_t *linked_list, void **item)) get_last;
this->public.insert_first = (status_t (*) (linked_list_t *linked_list, void *item)) insert_first;
this->public.insert_last = (status_t (*) (linked_list_t *linked_list, void *item)) insert_last;
this->public.remove = (status_t (*) (linked_list_t *linked_list, linked_list_iterator_t * element)) linked_list_remove;
this->public.remove_first = (status_t (*) (linked_list_t *linked_list, void **item)) remove_first;
this->public.remove_last = (status_t (*) (linked_list_t *linked_list, void **item)) remove_last;
this->public.destroy = (status_t (*) (linked_list_t *linked_list)) linked_list_destroy;

27
Source/charon/utils/linked_list.h
View File

@ -75,6 +75,19 @@ struct linked_list_iterator_t {
*/
status_t (*insert_after) (linked_list_iterator_t *this, void *item);
/**
* @brief removes an element from list at the given iterator position.
*
* The position of the iterator is set in the following order:
* - to the item before, if available
* - otherwise to the item after, if available
* - otherwise it gets reseted
*
* @param linked_list calling object
* @param iterator iterator holding the position of the element to remove
* @return SUCCESS if succeeded, FAILED otherwise
*/
status_t (*remove) (linked_list_iterator_t *iterator);
/**
* @brief Resets a linked_list_iterator object
*
@ -135,20 +148,6 @@ struct linked_list_t {
*/
status_t (*insert_first) (linked_list_t *linked_list, void *item);
/**
* @brief removes an element from list at the given iterator position
*
* The position of the iterator is set in the following order:
* - to the item before, if available
* - otherwise to the item after, if available
* - otherwise it gets reseted
*
* @param linked_list calling object
* @param iterator iterator holding the position of the element to remove
* @return SUCCESS if succeeded, FAILED otherwise
*/
status_t (*remove) (linked_list_t *linked_list, linked_list_iterator_t *iterator);
/**
* @brief removes the first item in the list and returns its value
*

2
Source/charon/utils/logger_manager.c
View File

@ -257,7 +257,7 @@ static status_t destroy_logger (private_logger_manager_t *this,logger_t *logger)
status = NOT_FOUND;
if (entry->logger == logger)
{
this->loggers->remove(this->loggers,iterator);
iterator->remove(iterator);
allocator_free(entry);
logger->destroy(logger);
status = SUCCESS;