denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- inserting and removing now needs a linked_list_iterator_t* instead of

Browse Source 
a linked_list_element_t*
- linked_list_element_t removed
- has_next now returns bool instead of status_t
This commit is contained in:
Jan Hutter
2005-11-08 13:31:39 +00:00
parent 6fb28da078
commit e3dd1393d5
4 changed files with 279 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/charon/event_queue.c
+5 -24
View File
@@ -224,10 +224,8 @@ static status_t get(private_event_queue_t *this, job_t **job)
static status_t add_absolute(private_event_queue_t *this, job_t *job, timeval_t time)
{
event_t *event = event_create(time,job);
linked_list_element_t * current_list_element;
event_t *current_event;
status_t status;
bool has_next;
int count;
if (event == NULL)
@@ -275,34 +273,17 @@ static status_t add_absolute(private_event_queue_t *this, job_t *job, timeval_t
}
status = iterator->has_next(iterator,&has_next);
/* first element has not to be checked (already done) */
status = iterator->has_next(iterator,&has_next);
if (status != SUCCESS)
{
iterator->destroy(iterator);
break;
}
iterator->has_next(iterator);
/* first element has not to be checked (already done) */
while(has_next)
while(iterator->has_next(iterator))
{
status = iterator->current(iterator,&current_list_element);
if (status != SUCCESS)
{
break;
}
current_event = (event_t *) current_list_element->value;
status = iterator->current(iterator,(void **) &current_event);
if (time_difference(&(event->time), &(current_event->time)) <= 0)
{
/* my event has to be fired before the current event in list */
status = this->list->insert_before(this->list,current_list_element,event);
break;
}
iterator->has_next(iterator,&has_next);
if (status != SUCCESS)
{
status = this->list->insert_before(this->list,iterator,event);
break;
}
}