X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dbus%2Fdbus-list.c;h=e71a7c4abb7ccbf1ceccb5275aad97b92def726e;hb=ee1133de4dc5e181be5d09f084d8823388d5f693;hp=546da5cdaeccda94a240da4a919fe729fde96774;hpb=a1a53c32422230fb76e8e3bca67c877dd2857563;p=platform%2Fupstream%2Fdbus.git diff --git a/dbus/dbus-list.c b/dbus/dbus-list.c index 546da5c..e71a7c4 100644 --- a/dbus/dbus-list.c +++ b/dbus/dbus-list.c @@ -341,6 +341,7 @@ _dbus_list_remove_last (DBusList **list, DBusList *link; link = _dbus_list_get_last_link (list); + while (link != NULL) { if (link->data == data) @@ -884,10 +885,22 @@ _dbus_list_test (void) link1 = _dbus_list_get_next_link (&list1, link1); ++i; } - + + --i; + link1 = _dbus_list_get_last_link (&list1); + while (link1 != NULL) + { + verify_list (&link1); /* pretend this link is the head */ + + _dbus_assert (_DBUS_POINTER_TO_INT (link1->data) == i); + + link1 = _dbus_list_get_prev_link (&list1, link1); + --i; + } + _dbus_list_clear (&list1); _dbus_list_clear (&list2); - + /* Test remove */ i = 0; @@ -1106,6 +1119,18 @@ _dbus_list_test (void) _dbus_list_clear (&list1); + /* using remove_last */ + _dbus_list_append (&list1, _DBUS_INT_TO_POINTER (2)); + _dbus_list_append (&list1, _DBUS_INT_TO_POINTER (1)); + _dbus_list_append (&list1, _DBUS_INT_TO_POINTER (3)); + + _dbus_list_remove_last (&list1, _DBUS_INT_TO_POINTER (2)); + + verify_list (&list1); + _dbus_assert (is_ascending_sequence (&list1)); + + _dbus_list_clear (&list1); + return TRUE; }