sysadmin/ipxe
1
0
Fork 0
mirror of https://github.com/ipxe/ipxe synced 2026-02-02 19:57:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

[list] Add list_for_each_entry_safe_continue()

Browse Source 
Signed-off-by: Michael Brown <mcb30@ipxe.org>
This commit is contained in:
Michael Brown
2024-02-13 16:26:34 +00:00
parent 88b291d647
commit e10dfe5dc7
2 changed files with 48 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/include/ipxe/list.h
View File

@@ -489,6 +489,22 @@ extern void extern_list_splice_tail_init ( struct list_head *list,
&pos->member != (head); \ &pos->member != (head); \
pos = list_entry ( pos->member.prev, typeof ( *pos ), member ) ) pos = list_entry ( pos->member.prev, typeof ( *pos ), member ) )
/**
* Iterate over subsequent entries in a list, safe against deletion
*
* @v pos Iterator
* @v tmp Temporary value (of same type as iterator)
* @v head List head
* @v member Name of list field within iterator's type
*/
#define list_for_each_entry_safe_continue( pos, tmp, head, member ) \
for ( list_check ( (head) ), \
pos = list_entry ( pos->member.next, typeof ( *pos ), member ), \
tmp = list_entry ( pos->member.next, typeof ( *tmp ), member ); \
&pos->member != (head); \
pos = tmp, \
tmp = list_entry ( tmp->member.next, typeof ( *tmp ), member ) )
/** /**
* Test if list contains a specified entry * Test if list contains a specified entry
* *

32
src/tests/list_test.c
View File

@@ -518,6 +518,38 @@ static void list_test_exec ( void ) {
list_iterate_entry_ok ( list_for_each_entry_continue_reverse, "", list_iterate_entry_ok ( list_for_each_entry_continue_reverse, "",
pos, list, list ); pos, list, list );
/* Test list_for_each_entry_safe_continue() */
INIT_LIST_HEAD ( list );
list_add_tail ( &list_tests[9].list, list );
list_add_tail ( &list_tests[4].list, list );
list_add_tail ( &list_tests[2].list, list );
list_add_tail ( &list_tests[5].list, list );
list_add_tail ( &list_tests[7].list, list );
{
char *expecteds[] = { "94257", "9457", "947", "94" };
char **expected = expecteds;
pos = &list_tests[4];
list_for_each_entry_safe_continue ( pos, tmp, list, list ) {
list_contents_ok ( list, *expected );
list_del ( &pos->list );
expected++;
list_contents_ok ( list, *expected );
}
}
list_contents_ok ( list, "94" );
{
char *expecteds[] = { "94", "4", "" };
char **expected = expecteds;
ok ( pos == list_entry ( list, struct list_test, list ) );
list_for_each_entry_safe_continue ( pos, tmp, list, list ) {
list_contents_ok ( list, *expected );
list_del ( &pos->list );
expected++;
list_contents_ok ( list, *expected );
}
}
ok ( list_empty ( list ) );
/* Test list_contains() and list_contains_entry() */ /* Test list_contains() and list_contains_entry() */
INIT_LIST_HEAD ( list ); INIT_LIST_HEAD ( list );
INIT_LIST_HEAD ( &list_tests[3].list ); INIT_LIST_HEAD ( &list_tests[3].list );