welterde/l2tpns
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

- fix case where ll_delete removes the last entry

Browse source 
- ll_iterate should pass item->data, not item
This commit is contained in:
bodea 2004-11-18 08:12:55 +00:00
parent 7cb3cf60e7
commit f6dea4dc93
1 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
ll.c
View file

@ -1,6 +1,6 @@
// L2TPNS Linked List Stuff // L2TPNS Linked List Stuff
char const *cvs_id_ll = "$Id: ll.c,v 1.5 2004/08/13 00:02:50 fred_nerk Exp $"; char const *cvs_id_ll = "$Id: ll.c,v 1.6 2004/11/18 08:12:55 bodea Exp $";
#include <stdio.h> #include <stdio.h>
#include <sys/file.h> #include <sys/file.h>
@ -74,9 +74,8 @@ void ll_iterate(linked_list *l, int(*func)(void *))
for (i = l->head; i; i = i->next) for (i = l->head; i; i = i->next)
{ {
if (i->data) if (i->data && !func(i->data))
if (!func(i)) break;
break;
} }
} }
@ -107,8 +106,8 @@ void ll_delete(linked_list *l, void *data)
if (i->data == data) if (i->data == data)
{ {
if (l->head == i) l->head = i->next; if (l->head == i) l->head = i->next;
if (l->end == i) l->end = i->next; if (l->end == i) l->end = p;
if (p) p->next = i->next; if (p) p->next = i->next;
free(i); free(i);
l->current = NULL; l->current = NULL;
return; return;