diff options
| author | Havoc Pennington <hp@redhat.com> | 2003-10-16 06:34:51 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@redhat.com> | 2003-10-16 06:34:51 +0000 |
| commit | d6e1b2adb3d8e51ce1bb47295cef12d9fe1a15a8 (patch) | |
| tree | d94b220a2886b384ddc4f55df4689d79430a6399 /dbus/dbus-internals.c | |
| parent | 9b9dd4b80eb2753fc67bed1f48eef89674ba968e (diff) | |
2003-10-16 Havoc Pennington <hp@redhat.com>
* bus/connection.c (bus_pending_reply_expired): either cancel or
execute, not both
(bus_connections_check_reply): use unlink, not remove_link, as we
don't want to free the link; fixes double free mess
* dbus/dbus-pending-call.c (dbus_pending_call_block): fix in case
where no reply was received
* dbus/dbus-connection.c (_dbus_pending_call_complete_and_unlock):
fix a refcount leak
* bus/signals.c (match_rule_matches): add special cases for the
bus driver, so you can match on sender/destination for it.
* dbus/dbus-sysdeps.c (_dbus_abort): print backtrace if
DBUS_PRINT_BACKTRACE is set
* dbus/dbus-internals.c: add pid to assertion failure messages
* dbus/dbus-connection.c: add message type code to the debug spew
* glib/dbus-gproxy.c (gproxy_get_match_rule): match rules want
sender=foo not service=foo
* dbus/dbus-bus.c (dbus_bus_get): if the activation bus is the
session bus but DBUS_SESSION_BUS_ADDRESS isn't set, use
DBUS_ACTIVATION_ADDRESS instead
* bus/activation.c: set DBUS_SESSION_BUS_ADDRESS,
DBUS_SYSTEM_BUS_ADDRESS if appropriate
* bus/bus.c (bus_context_new): handle OOM copying bus type into
context struct
* dbus/dbus-message.c (dbus_message_iter_get_object_path): new function
(dbus_message_iter_get_object_path_array): new function (half
finished, disabled for the moment)
* glib/dbus-gproxy.c (dbus_gproxy_end_call): properly handle
DBUS_MESSAGE_TYPE_ERROR
* tools/dbus-launch.c (babysit): support DBUS_DEBUG_OUTPUT to
avoid redirecting stderr to /dev/null
(babysit): close stdin if not doing the "exit_with_session" thing
* dbus/dbus-sysdeps.c (_dbus_become_daemon): delete some leftover
debug code; change DBUS_DEBUG_OUTPUT to only enable stderr, not
stdout/stdin, so things don't get confused
* bus/system.conf.in: fix to allow replies, I modified .conf
instead of .conf.in again.
Diffstat (limited to 'dbus/dbus-internals.c')
| -rw-r--r-- | dbus/dbus-internals.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/dbus/dbus-internals.c b/dbus/dbus-internals.c index 44f3ff47..9a2aa2b1 100644 --- a/dbus/dbus-internals.c +++ b/dbus/dbus-internals.c @@ -223,6 +223,8 @@ _dbus_verbose_real (const char *format, va_start (args, format); vfprintf (stderr, format, args); va_end (args); + + fflush (stderr); } /** @@ -424,7 +426,7 @@ _dbus_header_field_to_string (int header_field) #ifndef DBUS_DISABLE_CHECKS /** String used in _dbus_return_if_fail macro */ const char _dbus_return_if_fail_warning_format[] = -"Arguments to %s() were incorrect, assertion \"%s\" failed in file %s line %d.\n" +"%lu: arguments to %s() were incorrect, assertion \"%s\" failed in file %s line %d.\n" "This is normally a bug in some application using the D-BUS library.\n"; #endif @@ -448,8 +450,8 @@ _dbus_real_assert (dbus_bool_t condition, { if (!condition) { - _dbus_warn ("Assertion failed \"%s\" file \"%s\" line %d process %lu\n", - condition_text, file, line, _dbus_getpid ()); + _dbus_warn ("%lu: assertion failed \"%s\" file \"%s\" line %d\n", + _dbus_getpid (), condition_text, file, line); _dbus_abort (); } } |