colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

shared: allow nm_c_list_move_*() API also to move from one list to another

Browse Source 
Previously, nm_c_list_move_*() only allowed to move element inside the
same list. Relax that, it works just the same list to move the element
from one list into a different list.
This commit is contained in:
Thomas Haller
2019-06-21 14:45:07 +02:00
parent bf6e902c90
commit fcaf7994f2
1 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
shared/nm-glib-aux/nm-c-list.h
View File

@@ -101,12 +101,24 @@ nm_c_list_elem_find_first (CList *head, gconstpointer needle)
/*****************************************************************************/
/**
* nm_c_list_move_before:
* @lst: the list element to which @elem will be prepended.
* @elem: the list element to move.
*
* This unlinks @elem from the current list and linkes it before
* @lst. This is like c_list_link_before(), except that @elem must
* be initialized and linked. Note that @elem may be linked in @lst
* or in another list. In both cases it gets moved.
*
* Returns: %TRUE if there were any changes. %FALSE if elem was already
* linked at the right place.
*/
static inline gboolean
nm_c_list_move_before (CList *lst, CList *elem)
{
nm_assert (lst);
nm_assert (elem);
nm_assert (c_list_contains (lst, elem));
if ( lst != elem
&& lst->prev != elem) {
@@ -118,12 +130,24 @@ nm_c_list_move_before (CList *lst, CList *elem)
}
#define nm_c_list_move_tail(lst, elem) nm_c_list_move_before (lst, elem)
/**
* nm_c_list_move_after:
* @lst: the list element to which @elem will be prepended.
* @elem: the list element to move.
*
* This unlinks @elem from the current list and linkes it after
* @lst. This is like c_list_link_after(), except that @elem must
* be initialized and linked. Note that @elem may be linked in @lst
* or in another list. In both cases it gets moved.
*
* Returns: %TRUE if there were any changes. %FALSE if elem was already
* linked at the right place.
*/
static inline gboolean
nm_c_list_move_after (CList *lst, CList *elem)
{
nm_assert (lst);
nm_assert (elem);
nm_assert (c_list_contains (lst, elem));
if ( lst != elem
&& lst->next != elem) {