fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-02-06 09:20:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

shared: indicate changes when only reordering happens during nm_dedup_multi_index_add()

Browse source 
The return value shall indicate whether the add-call changed anything.
Reordering shall count as a change too.

On the other hand, clearing the dirty flag of the entry does not count
as a change.
This commit is contained in:
Thomas Haller 2017-08-16 14:35:55 +02:00
parent d100ce28e0
commit 3fc501e833
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
shared/nm-utils/nm-dedup-multi.c
View file

@ -253,6 +253,8 @@ _add (NMDedupMultiIndex *self,
}));
if (entry) {
gboolean changed = FALSE;
nm_dedup_multi_entry_set_dirty (entry, FALSE);
nm_assert (!head_existing || entry->head == head_existing);
@ -270,11 +272,13 @@ _add (NMDedupMultiIndex *self,
&& entry->lst_entries.next != &entry_order->lst_entries) {
c_list_unlink (&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_link_front ((CList *) &entry->head->lst_entries_head, &entry->lst_entries);
changed = TRUE;
}
}
break;
@ -284,11 +288,13 @@ _add (NMDedupMultiIndex *self,
&& entry->lst_entries.prev != &entry_order->lst_entries) {
c_list_unlink (&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_link_tail ((CList *) &entry->head->lst_entries_head, &entry->lst_entries);
changed = TRUE;
}
}
break;
@ -303,7 +309,7 @@ _add (NMDedupMultiIndex *self,
entry->obj)) {
NM_SET_OUT (out_entry, entry);
NM_SET_OUT (out_obj_old, nm_dedup_multi_obj_ref (entry->obj));
return FALSE;
return changed;
}
obj_new = nm_dedup_multi_index_obj_intern (self, obj);