diff options
| author | Havoc Pennington <hp@redhat.com> | 2005-01-16 02:23:56 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@redhat.com> | 2005-01-16 02:23:56 +0000 |
| commit | b3416423b1e3c17357833d896c1b7cd684660771 (patch) | |
| tree | 9f8ae4a2d65337f6b668aca787eadb8342e05db2 /dbus/dbus-marshal-header.c | |
| parent | 9c3d566e95c9080f6040c64531b0ccae22bd5d74 (diff) | |
2005-01-15 Havoc Pennington <hp@redhat.com>
* test/glib/test-profile.c (with_bus_server_filter): fix crash
* dbus/dbus-marshal-basic.c (_dbus_unpack_uint32): inline as macro
when DBUS_DISABLE_ASSERT
(_dbus_marshal_set_basic): be sure we align for the string length
* dbus/dbus-marshal-recursive.c (skip_one_complete_type): make
this look faster
* dbus/dbus-string.c (_dbus_string_get_const_data_len): add an
inline macro version
(_dbus_string_set_byte): provide inline macro version
Diffstat (limited to 'dbus/dbus-marshal-header.c')
| -rw-r--r-- | dbus/dbus-marshal-header.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/dbus/dbus-marshal-header.c b/dbus/dbus-marshal-header.c index 34940429..58ba86fe 100644 --- a/dbus/dbus-marshal-header.c +++ b/dbus/dbus-marshal-header.c @@ -328,14 +328,16 @@ set_basic_field (DBusTypeReader *reader, { DBusTypeReader sub; DBusTypeReader variant; - unsigned char v_BYTE; _dbus_type_reader_recurse (reader, &sub); _dbus_assert (_dbus_type_reader_get_current_type (&sub) == DBUS_TYPE_BYTE); #ifndef DBUS_DISABLE_ASSERT - _dbus_type_reader_read_basic (&sub, &v_BYTE); - _dbus_assert (((int) v_BYTE) == field); + { + unsigned char v_BYTE; + _dbus_type_reader_read_basic (&sub, &v_BYTE); + _dbus_assert (((int) v_BYTE) == field); + } #endif if (!_dbus_type_reader_next (&sub)) |