diff options
Diffstat (limited to 'shared/nm-utils/nm-dedup-multi.c')
| -rw-r--r-- | shared/nm-utils/nm-dedup-multi.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/shared/nm-utils/nm-dedup-multi.c b/shared/nm-utils/nm-dedup-multi.c index 8a59f1c4..ee310a7b 100644 --- a/shared/nm-utils/nm-dedup-multi.c +++ b/shared/nm-utils/nm-dedup-multi.c @@ -272,13 +272,13 @@ _add (NMDedupMultiIndex *self, if (entry_order) { if ( entry_order != entry && entry->lst_entries.next != &entry_order->lst_entries) { - c_list_unlink (&entry->lst_entries); + c_list_unlink_stale (&entry->lst_entries); c_list_link_before ((CList *) &entry_order->lst_entries, &entry->lst_entries); changed = TRUE; } } else { if (entry->lst_entries.prev != &entry->head->lst_entries_head) { - c_list_unlink (&entry->lst_entries); + c_list_unlink_stale (&entry->lst_entries); c_list_link_front ((CList *) &entry->head->lst_entries_head, &entry->lst_entries); changed = TRUE; } @@ -288,13 +288,13 @@ _add (NMDedupMultiIndex *self, if (entry_order) { if ( entry_order != entry && entry->lst_entries.prev != &entry_order->lst_entries) { - c_list_unlink (&entry->lst_entries); + c_list_unlink_stale (&entry->lst_entries); c_list_link_after ((CList *) &entry_order->lst_entries, &entry->lst_entries); changed = TRUE; } } else { if (entry->lst_entries.next != &entry->head->lst_entries_head) { - c_list_unlink (&entry->lst_entries); + c_list_unlink_stale (&entry->lst_entries); c_list_link_tail ((CList *) &entry->head->lst_entries_head, &entry->lst_entries); changed = TRUE; } @@ -541,12 +541,12 @@ _remove_entry (NMDedupMultiIndex *self, && !g_hash_table_remove (self->idx_entries, head_entry)) nm_assert_not_reached (); - c_list_unlink (&entry->lst_entries); + c_list_unlink_stale (&entry->lst_entries); g_slice_free (NMDedupMultiEntry, entry); if (head_entry) { nm_assert (c_list_is_empty (&head_entry->lst_entries_head)); - c_list_unlink (&head_entry->lst_idx); + c_list_unlink_stale (&head_entry->lst_idx); g_slice_free (NMDedupMultiHeadEntry, head_entry); } @@ -1027,13 +1027,13 @@ nm_dedup_multi_entry_reorder (const NMDedupMultiEntry *entry, nm_assert (c_list_contains (&head_entry->lst_entries_head, &entry->lst_entries)); if (order_after) { if (head_entry->lst_entries_head.prev != &entry->lst_entries) { - c_list_unlink ((CList *) &entry->lst_entries); + c_list_unlink_stale ((CList *) &entry->lst_entries); c_list_link_tail ((CList *) &head_entry->lst_entries_head, (CList *) &entry->lst_entries); return TRUE; } } else { if (head_entry->lst_entries_head.next != &entry->lst_entries) { - c_list_unlink ((CList *) &entry->lst_entries); + c_list_unlink_stale ((CList *) &entry->lst_entries); c_list_link_front ((CList *) &head_entry->lst_entries_head, (CList *) &entry->lst_entries); return TRUE; } @@ -1041,13 +1041,13 @@ nm_dedup_multi_entry_reorder (const NMDedupMultiEntry *entry, } else if (entry != entry_order) { if (order_after) { if (entry_order->lst_entries.next != &entry->lst_entries) { - c_list_unlink ((CList *) &entry->lst_entries); + c_list_unlink_stale ((CList *) &entry->lst_entries); c_list_link_after ((CList *) &entry_order->lst_entries, (CList *) &entry->lst_entries); return TRUE; } } else { if (entry_order->lst_entries.prev != &entry->lst_entries) { - c_list_unlink ((CList *) &entry->lst_entries); + c_list_unlink_stale ((CList *) &entry->lst_entries); c_list_link_before ((CList *) &entry_order->lst_entries, (CList *) &entry->lst_entries); return TRUE; } |