diff options
| author | Havoc Pennington <hp@redhat.com> | 2003-04-10 05:12:19 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@redhat.com> | 2003-04-10 05:12:19 +0000 |
| commit | 51781f541094a4936d47119cd62682e0431c41e9 (patch) | |
| tree | d551d4ed8147fd12a73a86ea3febd95608fff491 /dbus/dbus-message.c | |
| parent | 49f6e320d790e168ccec040ad47b787c32107bde (diff) | |
| download | dbus-51781f541094a4936d47119cd62682e0431c41e9.tar.gz | |
2003-04-10 Havoc Pennington <hp@pobox.com>
* bus/dispatch.c: lots of fixes
* dbus/dbus-mainloop.c (_dbus_loop_dispatch): export
(_dbus_loop_iterate): remove old "quit if no callbacks" code,
that was crack, broke the test service.
* dbus/dbus-transport.c (_dbus_transport_open): fix error
handling to avoid piling up errors if we get a failure on the
first address.
* dbus/dbus-internals.c (_dbus_real_assert_not_reached): include
pid in assertion failures.
* dbus/dbus-mainloop.c (_dbus_loop_iterate): use static arrays up
to some fixed size of file descriptor array. Don't return TRUE
anytime a timeout exists, that led to lots of busy loop silliness
in the tests.
Diffstat (limited to 'dbus/dbus-message.c')
| -rw-r--r-- | dbus/dbus-message.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/dbus/dbus-message.c b/dbus/dbus-message.c index 35cf1b5a..6bddc3f0 100644 --- a/dbus/dbus-message.c +++ b/dbus/dbus-message.c @@ -3453,9 +3453,6 @@ decode_header_data (const DBusString *data, _dbus_assert (_DBUS_ALIGN_ADDRESS (field, 4) == field); - /* I believe FROM_BE is right, but if not we'll find out - * I guess. ;-) - */ switch (DBUS_UINT32_FROM_BE (*(int*)field)) { case DBUS_HEADER_FIELD_SERVICE_AS_UINT32: @@ -3732,7 +3729,10 @@ _dbus_message_loader_queue_messages (DBusMessageLoader *loader) message = dbus_message_new_empty_header (); if (message == NULL) - return FALSE; + { + _dbus_verbose ("Failed to allocate empty message\n"); + return FALSE; + } message->byte_order = byte_order; message->header_padding = header_padding; @@ -3747,6 +3747,7 @@ _dbus_message_loader_queue_messages (DBusMessageLoader *loader) if (!_dbus_list_append (&loader->messages, message)) { + _dbus_verbose ("Failed to append new message to loader queue\n"); dbus_message_unref (message); return FALSE; } @@ -3759,6 +3760,7 @@ _dbus_message_loader_queue_messages (DBusMessageLoader *loader) if (!_dbus_string_move_len (&loader->data, 0, header_len, &message->header, 0)) { + _dbus_verbose ("Failed to move header into new message\n"); _dbus_list_remove_last (&loader->messages, message); dbus_message_unref (message); return FALSE; @@ -3768,6 +3770,8 @@ _dbus_message_loader_queue_messages (DBusMessageLoader *loader) { dbus_bool_t result; + _dbus_verbose ("Failed to move body into new message\n"); + /* put the header back, we'll try again later */ result = _dbus_string_copy_len (&message->header, 0, header_len, &loader->data, 0); |