diff options
author | Havoc Pennington <hp@redhat.com> | 2006-10-17 20:52:13 +0000 |
---|---|---|
committer | Havoc Pennington <hp@redhat.com> | 2006-10-17 20:52:13 +0000 |
commit | f1ca9b89e92de4d876dc5e7e85710c4d2dc87638 (patch) | |
tree | 4f52c7303bd028114da11e6a8d212d4059ad2570 /dbus/dbus-bus.c | |
parent | c4b5ea1b95f5c14fb9f51e51367d7bc9201e8b71 (diff) |
2006-10-17 Havoc Pennington <hp@redhat.com>
* dbus/dbus-internals.c (_dbus_warn_check_failed): new function to
be used for return_if_fail type warnings; prefixes the pid, and
fatal by default.
Diffstat (limited to 'dbus/dbus-bus.c')
-rw-r--r-- | dbus/dbus-bus.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/dbus/dbus-bus.c b/dbus/dbus-bus.c index 9eb2c526..1661f246 100644 --- a/dbus/dbus-bus.c +++ b/dbus/dbus-bus.c @@ -93,7 +93,7 @@ addresses_shutdown_func (void *data) while (i < N_BUS_TYPES) { if (bus_connections[i] != NULL) - _dbus_warn ("dbus_shutdown() called but connections were still live!"); + _dbus_warn_check_failed ("dbus_shutdown() called but connections were still live. This probably means the application did not drop all its references to bus connections.\n"); dbus_free (bus_connection_addresses[i]); bus_connection_addresses[i] = NULL; @@ -547,10 +547,9 @@ dbus_bus_register (DBusConnection *connection, if (bd->unique_name != NULL) { - _dbus_warn ("Attempt to register the same DBusConnection with the message bus, but it is already registered\n"); - /* This isn't an error, it's a programming bug. We'll be nice - * and not _dbus_assert_not_reached() - */ + _dbus_warn_check_failed ("Attempt to register the same DBusConnection %s with the message bus a second time.\n", + bd->unique_name); + /* This isn't an error, it's a programming bug. so return TRUE */ return TRUE; } |