diff options
| author | Havoc Pennington <hp@redhat.com> | 2005-01-17 00:16:28 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@redhat.com> | 2005-01-17 00:16:28 +0000 |
| commit | aad6fa897f85486386b030847151cb09943c97c0 (patch) | |
| tree | 3996469d2be2df0bc63a4e8dd0aa3ac6cdfaddcb /dbus/dbus-internals.c | |
| parent | 7f9721a6d36697a57170c604aa845af3531bd157 (diff) | |
2005-01-16 Havoc Pennington <hp@redhat.com>
* dbus/dbus-internals.c (_dbus_real_assert): print the function
name the assertion failed in
* dbus/dbus-internals.h (_dbus_return_if_fail)
(_dbus_return_val_if_fail): assert that the name of the function
containing the check doesn't start with '_', since we only want to
use checks on public functions
* dbus/dbus-connection.c (_dbus_connection_ref_unlocked): change
checks to assertions
* dbus/dbus-marshal-header.c (_dbus_header_set_field_basic):
change checks to asserts for private function
* dbus/dbus-message.c (_dbus_message_set_serial): checks
to asserts for private function
* dbus/dbus-marshal-recursive.c (skip_one_complete_type): remove
broken assertion that was breaking make check
(_dbus_type_reader_array_is_empty): remove this rather than fix
it, was only used in assertions
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 2aa26805..eba3174d 100644 --- a/dbus/dbus-internals.c +++ b/dbus/dbus-internals.c @@ -406,17 +406,19 @@ const char _dbus_return_if_fail_warning_format[] = * @param condition_text condition as a string * @param file file the assertion is in * @param line line the assertion is in + * @param func function the assertion is in */ void _dbus_real_assert (dbus_bool_t condition, const char *condition_text, const char *file, - int line) + int line, + const char *func) { if (_DBUS_UNLIKELY (!condition)) { - _dbus_warn ("%lu: assertion failed \"%s\" file \"%s\" line %d\n", - _dbus_getpid (), condition_text, file, line); + _dbus_warn ("%lu: assertion failed \"%s\" file \"%s\" line %d function %s\n", + _dbus_getpid (), condition_text, file, line, func); _dbus_abort (); } } |