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-basic.h | |
| 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-basic.h')
| -rw-r--r-- | dbus/dbus-marshal-basic.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/dbus/dbus-marshal-basic.h b/dbus/dbus-marshal-basic.h index ddfce18e..cf86e713 100644 --- a/dbus/dbus-marshal-basic.h +++ b/dbus/dbus-marshal-basic.h @@ -136,6 +136,13 @@ typedef union char *str; } DBusBasicValue; +#ifdef DBUS_DISABLE_ASSERT +#define _dbus_unpack_uint32(byte_order, data) \ + (((byte_order) == DBUS_LITTLE_ENDIAN) ? \ + DBUS_UINT32_FROM_LE (*(dbus_uint32_t*)(data)) : \ + DBUS_UINT32_FROM_BE (*(dbus_uint32_t*)(data))) +#endif + void _dbus_pack_int32 (dbus_int32_t value, int byte_order, unsigned char *data); @@ -144,9 +151,10 @@ dbus_int32_t _dbus_unpack_int32 (int byte_order, void _dbus_pack_uint32 (dbus_uint32_t value, int byte_order, unsigned char *data); +#ifndef _dbus_unpack_uint32 dbus_uint32_t _dbus_unpack_uint32 (int byte_order, const unsigned char *data); - +#endif dbus_bool_t _dbus_marshal_set_basic (DBusString *str, int pos, |