diff options
| -rw-r--r-- | bus/driver.c | 23 | ||||
| -rw-r--r-- | dbus/dbus-connection.c | 3 | ||||
| -rw-r--r-- | dbus/dbus-message.c | 5 | ||||
| -rw-r--r-- | dbus/dbus-string-private.h | 1 |
4 files changed, 23 insertions, 9 deletions
diff --git a/bus/driver.c b/bus/driver.c index 7554d331..574e0f3d 100644 --- a/bus/driver.c +++ b/bus/driver.c @@ -827,7 +827,6 @@ bus_driver_handle_update_activation_environment (DBusConnection *connection, DBusMessageIter iter; DBusMessageIter dict_iter; DBusMessageIter dict_entry_iter; - int msg_type; int array_type; int key_type; DBusList *keys, *key_link; @@ -842,9 +841,13 @@ 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. */ - msg_type = dbus_message_iter_get_arg_type (&iter); +#ifndef DBUS_DISABLE_ASSERT + { + int msg_type = dbus_message_iter_get_arg_type (&iter); - _dbus_assert (msg_type == DBUS_TYPE_ARRAY); + _dbus_assert (msg_type == DBUS_TYPE_ARRAY); + } +#endif dbus_message_iter_recurse (&iter, &dict_iter); @@ -1930,7 +1933,7 @@ bus_driver_handle_message (DBusConnection *connection, DBusMessage *message, DBusError *error) { - const char *name, *sender, *interface; + const char *name, *interface; const InterfaceHandler *ih; const MessageHandler *mh; dbus_bool_t found_interface = FALSE; @@ -1957,13 +1960,17 @@ bus_driver_handle_message (DBusConnection *connection, _dbus_assert (dbus_message_get_member (message) != NULL); name = dbus_message_get_member (message); - sender = dbus_message_get_sender (message); - _dbus_verbose ("Driver got a method call: %s\n", - dbus_message_get_member (message)); + _dbus_verbose ("Driver got a method call: %s\n", name); /* security checks should have kept this from getting here */ - _dbus_assert (sender != NULL || strcmp (name, "Hello") == 0); +#ifndef DBUS_DISABLE_ASSERT + { + const char *sender = dbus_message_get_sender (message); + + _dbus_assert (sender != NULL || strcmp (name, "Hello") == 0); + } +#endif for (ih = interface_handlers; ih->name != NULL; ih++) { diff --git a/dbus/dbus-connection.c b/dbus/dbus-connection.c index cb1da8c1..9128ffc7 100644 --- a/dbus/dbus-connection.c +++ b/dbus/dbus-connection.c @@ -3884,7 +3884,8 @@ dbus_connection_steal_borrowed_message (DBusConnection *connection, pop_message = _dbus_list_pop_first (&connection->incoming_messages); _dbus_assert (message == pop_message); - + (void) pop_message; /* unused unless asserting */ + connection->n_incoming -= 1; _dbus_verbose ("Incoming message %p stolen from queue, %d incoming\n", diff --git a/dbus/dbus-message.c b/dbus/dbus-message.c index cc1cfa17..0c7e80d6 100644 --- a/dbus/dbus-message.c +++ b/dbus/dbus-message.c @@ -2267,12 +2267,14 @@ dbus_message_iter_get_fixed_array (DBusMessageIter *iter, int *n_elements) { DBusMessageRealIter *real = (DBusMessageRealIter *)iter; +#ifndef DBUS_DISABLE_CHECKS int subtype = _dbus_type_reader_get_current_type(&real->u.reader); _dbus_return_if_fail (_dbus_message_iter_check (real)); _dbus_return_if_fail (value != NULL); _dbus_return_if_fail ((subtype == DBUS_TYPE_INVALID) || (dbus_type_is_fixed (subtype) && subtype != DBUS_TYPE_UNIX_FD)); +#endif _dbus_type_reader_read_fixed_multi (&real->u.reader, value, n_elements); @@ -2824,12 +2826,14 @@ dbus_message_iter_abandon_container (DBusMessageIter *iter, DBusMessageIter *sub) { DBusMessageRealIter *real = (DBusMessageRealIter *)iter; +#ifndef DBUS_DISABLE_CHECKS DBusMessageRealIter *real_sub = (DBusMessageRealIter *)sub; _dbus_return_if_fail (_dbus_message_iter_append_check (real)); _dbus_return_if_fail (real->iter_type == DBUS_MESSAGE_ITER_TYPE_WRITER); _dbus_return_if_fail (_dbus_message_iter_append_check (real_sub)); _dbus_return_if_fail (real_sub->iter_type == DBUS_MESSAGE_ITER_TYPE_WRITER); +#endif _dbus_message_iter_abandon_signature (real); } @@ -4701,6 +4705,7 @@ dbus_message_demarshal_bytes_needed(const char *buf, if (validity == DBUS_VALID) { _dbus_assert (have_message || (header_len + body_len) > len); + (void) have_message; /* unused unless asserting */ return header_len + body_len; } else diff --git a/dbus/dbus-string-private.h b/dbus/dbus-string-private.h index 2a4043a0..2e6de900 100644 --- a/dbus/dbus-string-private.h +++ b/dbus/dbus-string-private.h @@ -75,6 +75,7 @@ _DBUS_STATIC_ASSERT (sizeof (DBusRealString) == sizeof (DBusString)); */ #define DBUS_GENERIC_STRING_PREAMBLE(real) \ do { \ + (void) real; /* might be unused unless asserting */ \ _dbus_assert ((real) != NULL); \ _dbus_assert (!(real)->invalid); \ _dbus_assert ((real)->len >= 0); \ |