diff options
| author | Chengwei Yang <chengwei.yang@intel.com> | 2013-08-23 16:57:30 +0800 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-08-23 11:54:34 +0100 |
| commit | 8203fe35da82cd9d3491ed8ac8a2a37cfa83f4e6 (patch) | |
| tree | c940b62ef61108865041ff2bda7874a8e04314b9 /bus | |
| parent | fa783ea4ea540e8a13102a77cddef235e3fc1d6b (diff) | |
| download | dbus-8203fe35da82cd9d3491ed8ac8a2a37cfa83f4e6.tar.gz | |
Cleanup: simplify assertion check
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=68303
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Diffstat (limited to 'bus')
| -rw-r--r-- | bus/driver.c | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/bus/driver.c b/bus/driver.c index 23197e43..e95a79d9 100644 --- a/bus/driver.c +++ b/bus/driver.c @@ -885,13 +885,7 @@ bus_driver_handle_update_activation_environment (DBusConnection *connection, /* The message signature has already been checked for us, * so let's just assert it's right. */ -#ifndef DBUS_DISABLE_ASSERT - { - int msg_type = dbus_message_iter_get_arg_type (&iter); - - _dbus_assert (msg_type == DBUS_TYPE_ARRAY); - } -#endif + _dbus_assert (dbus_message_iter_get_arg_type (&iter) == DBUS_TYPE_ARRAY); dbus_message_iter_recurse (&iter, &dict_iter); @@ -2008,13 +2002,8 @@ bus_driver_handle_message (DBusConnection *connection, _dbus_verbose ("Driver got a method call: %s\n", name); /* security checks should have kept this from getting here */ -#ifndef DBUS_DISABLE_ASSERT - { - const char *sender = dbus_message_get_sender (message); - - _dbus_assert (sender != NULL || strcmp (name, "Hello") == 0); - } -#endif + _dbus_assert (dbus_message_get_sender (message) != NULL || + strcmp (name, "Hello") == 0); for (ih = interface_handlers; ih->name != NULL; ih++) { |