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-message.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-message.c')
| -rw-r--r-- | dbus/dbus-message.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/dbus/dbus-message.c b/dbus/dbus-message.c index 70e1d022..fc83a07e 100644 --- a/dbus/dbus-message.c +++ b/dbus/dbus-message.c @@ -153,9 +153,9 @@ void _dbus_message_set_serial (DBusMessage *message, dbus_uint32_t serial) { - _dbus_return_if_fail (message != NULL); - _dbus_return_if_fail (!message->locked); - _dbus_return_if_fail (dbus_message_get_serial (message) == 0); + _dbus_assert (message != NULL); + _dbus_assert (!message->locked); + _dbus_assert (dbus_message_get_serial (message) == 0); _dbus_header_set_serial (&message->header, serial); } @@ -4121,7 +4121,7 @@ message_iter_test (DBusMessage *message) if (dbus_message_iter_get_arg_type (&iter) != DBUS_TYPE_ARRAY) _dbus_assert_not_reached ("Argument type not an array"); - if (dbus_message_iter_get_array_type (&iter) != DBUS_TYPE_DOUBLE) + if (dbus_message_iter_get_element_type (&iter) != DBUS_TYPE_DOUBLE) _dbus_assert_not_reached ("Array type not double"); dbus_message_iter_recurse (&iter, &array); @@ -4140,7 +4140,7 @@ message_iter_test (DBusMessage *message) if (dbus_message_iter_get_arg_type (&iter) != DBUS_TYPE_ARRAY) _dbus_assert_not_reached ("no array"); - if (dbus_message_iter_get_array_type (&iter) != DBUS_TYPE_INT32) + if (dbus_message_iter_get_element_type (&iter) != DBUS_TYPE_INT32) _dbus_assert_not_reached ("Array type not int32"); /* Empty array */ |