diff options
| author | Havoc Pennington <hp@redhat.com> | 2003-03-31 20:56:29 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@redhat.com> | 2003-03-31 20:56:29 +0000 |
| commit | fa05de9230d62e7c427b5313796fc6ccd4d0ff60 (patch) | |
| tree | 206890e8df6a575c150b901bf108b1c0a1e98824 /dbus/dbus-marshal.c | |
| parent | 7af59334331fbd097a24c4942c75181882b96747 (diff) | |
2003-03-31 Havoc Pennington <hp@redhat.com>
Fix some annoying DBusString API and fix all affected code.
* dbus/dbus-string.c (_dbus_string_init): get rid of annoying
max_length argument
(_dbus_string_get_data): change to return string instead of using
an out param
(_dbus_string_get_const_data): ditto
(_dbus_string_get_data_len): ditto
(_dbus_string_get_const_data_len): ditto
Diffstat (limited to 'dbus/dbus-marshal.c')
| -rw-r--r-- | dbus/dbus-marshal.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/dbus/dbus-marshal.c b/dbus/dbus-marshal.c index 51c4ce10..2222ad9b 100644 --- a/dbus/dbus-marshal.c +++ b/dbus/dbus-marshal.c @@ -157,7 +157,7 @@ _dbus_marshal_set_int32 (DBusString *str, _dbus_assert (byte_order == DBUS_LITTLE_ENDIAN || byte_order == DBUS_BIG_ENDIAN); - _dbus_string_get_data_len (str, &data, offset, 4); + data = _dbus_string_get_data_len (str, offset, 4); _dbus_pack_int32 (value, byte_order, data); } @@ -183,7 +183,7 @@ _dbus_marshal_set_uint32 (DBusString *str, _dbus_assert (byte_order == DBUS_LITTLE_ENDIAN || byte_order == DBUS_BIG_ENDIAN); - _dbus_string_get_data_len (str, &data, offset, 4); + data = _dbus_string_get_data_len (str, offset, 4); _dbus_pack_uint32 (value, byte_order, data); } @@ -705,7 +705,7 @@ _dbus_demarshal_double (const DBusString *str, pos = _DBUS_ALIGN_VALUE (pos, sizeof (double)); - _dbus_string_get_const_data_len (str, &buffer, pos, sizeof (double)); + buffer = _dbus_string_get_const_data_len (str, pos, sizeof (double)); retval = *(double *)buffer; @@ -807,7 +807,7 @@ _dbus_demarshal_string (const DBusString *str, if (!retval) return NULL; - _dbus_string_get_const_data_len (str, &data, pos, len); + data = _dbus_string_get_const_data_len (str, pos, len); if (!data) return NULL; @@ -865,7 +865,7 @@ _dbus_demarshal_byte_array (const DBusString *str, if (!retval) return FALSE; - _dbus_string_get_const_data_len (str, &data, pos, len); + data = _dbus_string_get_const_data_len (str, pos, len); if (!data) { @@ -1342,7 +1342,7 @@ _dbus_marshal_get_arg_end_pos (const DBusString *str, if (pos >= _dbus_string_get_length (str)) return FALSE; - _dbus_string_get_const_data_len (str, &data, pos, 1); + data = _dbus_string_get_const_data_len (str, pos, 1); switch (*data) { @@ -1602,7 +1602,7 @@ _dbus_marshal_validate_arg (const DBusString *str, if (pos >= _dbus_string_get_length (str)) return FALSE; - _dbus_string_get_const_data_len (str, &data, pos, 1); + data = _dbus_string_get_const_data_len (str, pos, 1); switch (*data) { @@ -1957,8 +1957,7 @@ _dbus_verbose_bytes_of_string (const DBusString *str, len = real_len - start; } - - _dbus_string_get_const_data_len (str, &d, start, len); + d = _dbus_string_get_const_data_len (str, start, len); _dbus_verbose_bytes (d, len); } @@ -1993,7 +1992,7 @@ _dbus_marshal_test (void) const char **our_string_array; DBusDict *dict; - if (!_dbus_string_init (&str, _DBUS_INT_MAX)) + if (!_dbus_string_init (&str)) _dbus_assert_not_reached ("failed to init string"); /* Marshal doubles */ |