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-string.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-string.h')
| -rw-r--r-- | dbus/dbus-string.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/dbus/dbus-string.h b/dbus/dbus-string.h index f0ae1e65..df5f4232 100644 --- a/dbus/dbus-string.h +++ b/dbus/dbus-string.h @@ -55,8 +55,10 @@ struct DBusString * Note that these break type safety (due to the casts) */ #define _dbus_string_get_length(s) (((DBusString*)(s))->dummy2) +#define _dbus_string_set_byte(s, i, b) ((((unsigned char*)(((DBusString*)(s))->dummy1))[(i)]) = (unsigned char) (b)) #define _dbus_string_get_byte(s, i) (((const unsigned char*)(((DBusString*)(s))->dummy1))[(i)]) #define _dbus_string_get_const_data(s) ((const char*)(((DBusString*)(s))->dummy1)) +#define _dbus_string_get_const_data_len(s,start,len) (((const char*)(((DBusString*)(s))->dummy1)) + (start)) #endif dbus_bool_t _dbus_string_init (DBusString *str); @@ -76,12 +78,16 @@ const char* _dbus_string_get_const_data (const DBusString *str); char* _dbus_string_get_data_len (DBusString *str, int start, int len); +#ifndef _dbus_string_get_const_data_len const char* _dbus_string_get_const_data_len (const DBusString *str, int start, int len); +#endif +#ifndef _dbus_string_set_byte void _dbus_string_set_byte (DBusString *str, int i, unsigned char byte); +#endif #ifndef _dbus_string_get_byte unsigned char _dbus_string_get_byte (const DBusString *str, int start); |