diff options
author | Anders Carlsson <andersca@codefactory.se> | 2003-01-27 11:20:55 +0000 |
---|---|---|
committer | Anders Carlsson <andersca@codefactory.se> | 2003-01-27 11:20:55 +0000 |
commit | ee1133de4dc5e181be5d09f084d8823388d5f693 (patch) | |
tree | c4641ef545f3ce65bfeb79ab4236ef71f785687c /dbus/dbus-list.c | |
parent | 2f440457d5fe45afb732820da64a147157e2e82d (diff) |
2003-01-27 Anders Carlsson <andersca@codefactory.se>
* bus/dispatch.c: (bus_dispatch_message_handler):
Dispatch messages sent to services.
* bus/driver.c: (bus_driver_send_service_deleted),
(bus_driver_send_service_created), (bus_driver_send_service_lost),
(bus_driver_send_service_acquired):
Add helper functions for sending service related messages.
(bus_driver_send_welcome_message):
Send HELLO_REPLY instead of WELCOME.
(bus_driver_handle_list_services):
Send LIST_SERVICES_REPLY instead of SERVICES.
(bus_driver_handle_own_service),
(bus_driver_handle_service_exists):
New message handlers.
(bus_driver_handle_message):
Invoke new message handlers.
(bus_driver_remove_connection):
Don't remove any services here since that's done automatically
by bus_service_remove_owner now.
* bus/driver.h:
New function signatures.
* bus/services.c: (bus_service_add_owner):
Send ServiceAcquired message if we're the only primary owner.
(bus_service_remove_owner):
Send ServiceAcquired/ServiceLost messages.
(bus_service_set_prohibit_replacement),
(bus_service_get_prohibit_replacement):
Functions for setting prohibit replacement.
(bus_service_has_owner):
New function that checks if a connection is in the owner queue of
a certain service.
* bus/services.h:
Add new function signatures.
* dbus/dbus-list.c: (_dbus_list_test):
Add tests for _dbus_list_remove_last and traversing the list backwards.
* dbus/dbus-list.h:
Fix a typo in _dbus_list_get_prev_link, if we're at the first element we can't
go any further, so return NULL then.
* dbus/dbus-protocol.h:
Add new messages, service flags and service replies.
Diffstat (limited to 'dbus/dbus-list.c')
-rw-r--r-- | dbus/dbus-list.c | 29 |
1 files changed, 27 insertions, 2 deletions
diff --git a/dbus/dbus-list.c b/dbus/dbus-list.c index 546da5cd..e71a7c4a 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; } |