diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-08-05 13:25:14 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-09-19 13:50:38 +0100 |
| commit | d1756a7e4cbb6ef83b70319ab72a49760f2c227e (patch) | |
| tree | 996534b08a81533b50d8f9e00a652458d0334174 /dbus | |
| parent | 2c1ad79c0c0ad3db7b469fc82176713daa06c478 (diff) | |
| download | dbus-d1756a7e4cbb6ef83b70319ab72a49760f2c227e.tar.gz | |
Fix an assortment of variables that aren't used when not checking/asserting
Diffstat (limited to 'dbus')
| -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 |
3 files changed, 8 insertions, 1 deletions
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); \ |