From f05f87a825ab8ed5273674a7f65521ffc526f0d2 Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Sat, 15 Mar 2003 06:00:01 +0000 Subject: 2003-03-15 Havoc Pennington * bus/dispatch.c (bus_dispatch_test): OK, now finally actually write useful test code, after all that futzing around ;-) Test does not yet pass because we can't handle OOM in _dbus_transport_messages_pending (basically, dbus_connection_preallocate_send() does not prealloc the write watch). To fix this, I think we need to add new stuff to set_watch_functions, namely a SetEnabled function so we can alloc the watch earlier, then enable it later. * dbus/Makefile.am (libdbus_convenience_la_SOURCES): move dbus-memory.c to the convenience lib * bus/test.c: rename some static functions to keep them clearly distinct from stuff in connection.c. Handle client disconnection. --- dbus/dbus-message.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'dbus/dbus-message.c') diff --git a/dbus/dbus-message.c b/dbus/dbus-message.c index b1fc6483..fe032dff 100644 --- a/dbus/dbus-message.c +++ b/dbus/dbus-message.c @@ -628,8 +628,10 @@ _dbus_message_add_size_counter (DBusMessage *message, _dbus_string_get_length (&message->header) + _dbus_string_get_length (&message->body); +#if 0 _dbus_verbose ("message has size %ld\n", message->size_counter_delta); +#endif _dbus_counter_adjust (message->size_counter, message->size_counter_delta); } @@ -2587,13 +2589,15 @@ decode_header_data (const DBusString *data, } fields[FIELD_SERVICE].offset = _DBUS_ALIGN_VALUE (pos + 1, 4); +#if 0 _dbus_verbose ("Found service name at offset %d\n", fields[FIELD_SERVICE].offset); +#endif break; case DBUS_HEADER_FIELD_NAME_AS_UINT32: if (fields[FIELD_NAME].offset >= 0) - { + { _dbus_verbose ("%s field provided twice\n", DBUS_HEADER_FIELD_NAME); return FALSE; @@ -2601,8 +2605,10 @@ decode_header_data (const DBusString *data, fields[FIELD_NAME].offset = _DBUS_ALIGN_VALUE (pos + 1, 4); +#if 0 _dbus_verbose ("Found message name at offset %d\n", fields[FIELD_NAME].offset); +#endif break; case DBUS_HEADER_FIELD_SENDER_AS_UINT32: if (fields[FIELD_SENDER].offset >= 0) -- cgit