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

made linked lists invoke() method consistent to clone_*() and destroy_*() methods

This commit is contained in:
Martin Willi 2007-08-09 12:43:11 +00:00
parent 10c6cc0a36
commit 939e93787e
3 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/charon/processing/jobs/callback_job.c
View File

@ -130,7 +130,7 @@ static void cancel(private_callback_job_t *this)
thread = this->thread;
/* terminate its children */
this->children->invoke(this->children, offsetof(callback_job_t, cancel));
this->children->invoke_offset(this->children, offsetof(callback_job_t, cancel));
pthread_mutex_unlock(&this->mutex);
/* terminate thread */

23
src/libstrongswan/utils/linked_list.c
View File

@ -631,9 +631,9 @@ static status_t get_last(private_linked_list_t *this, void **item)
}
/**
* Implementation of linked_list_t.invoke.
* Implementation of linked_list_t.invoke_offset.
*/
static void invoke(private_linked_list_t *this, size_t offset)
static void invoke_offset(private_linked_list_t *this, size_t offset)
{
element_t *current = this->first;
@ -645,6 +645,20 @@ static void invoke(private_linked_list_t *this, size_t offset)
}
}
/**
* Implementation of linked_list_t.invoke_function.
*/
static void invoke_function(private_linked_list_t *this, void(*fn)(void*))
{
element_t *current = this->first;
while (current)
{
fn(current->value);
current = current->next;
}
}
/**
* Implementation of linked_list_t.clone_offset
*/
@ -687,7 +701,7 @@ static void destroy(private_linked_list_t *this)
{
void *value;
/* Remove all list items before destroying list */
while (this->public.remove_first(&(this->public), &value) == SUCCESS)
while (remove_first(this, &value) == SUCCESS)
{
/* values are not destroyed so memory leaks are possible
* if list is not empty when deleting */
@ -789,7 +803,8 @@ linked_list_t *linked_list_create()
this->public.insert_at_position = (status_t (*) (linked_list_t *,size_t, void *))insert_at_position;
this->public.remove_at_position = (status_t (*) (linked_list_t *,size_t, void **))remove_at_position;
this->public.get_at_position = (status_t (*) (linked_list_t *,size_t, void **))get_at_position;
this->public.invoke = (void (*)(linked_list_t*,size_t))invoke;
this->public.invoke_offset = (void (*)(linked_list_t*,size_t))invoke_offset;
this->public.invoke_function = (void (*)(linked_list_t*,void(*)(void*)))invoke_function;
this->public.clone_offset = (linked_list_t * (*)(linked_list_t*,size_t))clone_offset;
this->public.clone_function = (linked_list_t * (*)(linked_list_t*,void*(*)(void*)))clone_function;
this->public.destroy = (void (*) (linked_list_t *))destroy;

10
src/libstrongswan/utils/linked_list.h
View File

@ -184,7 +184,15 @@ struct linked_list_t {
* @param this calling object
* @param offset offset of the method to invoke on objects
*/
void (*invoke) (linked_list_t *this, size_t offset);
void (*invoke_offset) (linked_list_t *this, size_t offset);
/**
* @brief Invoke a function on all of the contained objects.
*
* @param this calling object
* @param offset offset of the method to invoke on objects
*/
void (*invoke_function) (linked_list_t *this, void (*)(void*));
/**
* @brief Clones a list and its objects using the objects' clone method.