diff options
| author | Anders Carlsson <andersca@codefactory.se> | 2003-01-21 14:07:09 +0000 |
|---|---|---|
| committer | Anders Carlsson <andersca@codefactory.se> | 2003-01-21 14:07:09 +0000 |
| commit | 9e1199fed2c96fe305a27e5d3d4e1950ed2f0d0f (patch) | |
| tree | 273f2d661f6e0d9f7debf2a60dcb076f66811e65 /dbus/dbus-marshal.h | |
| parent | aff24a72c18a43dbb6f2d85e6d2226a3c2ea8f10 (diff) | |
2003-01-21 Anders Carlsson <andersca@codefactory.se>
* dbus/dbus-marshal.c: (_dbus_marshal_double),
(_dbus_marshal_int32), (_dbus_marshal_uint32),
(_dbus_marshal_int32_array), (_dbus_marshal_uint32_array),
(_dbus_marshal_double_array), (_dbus_marshal_string_array),
(_dbus_demarshal_int32_array), (_dbus_demarshal_uint32_array),
(_dbus_demarshal_double_array), (_dbus_demarshal_string_array),
(_dbus_marshal_get_field_end_pos), (_dbus_marshal_test):
* dbus/dbus-marshal.h:
* dbus/dbus-protocol.h:
Add support for marshalling and demarshalling integer, double
and string arrays.
Diffstat (limited to 'dbus/dbus-marshal.h')
| -rw-r--r-- | dbus/dbus-marshal.h | 71 |
1 files changed, 53 insertions, 18 deletions
diff --git a/dbus/dbus-marshal.h b/dbus/dbus-marshal.h index 1c4c0e40..5184318e 100644 --- a/dbus/dbus-marshal.h +++ b/dbus/dbus-marshal.h @@ -76,23 +76,39 @@ void _dbus_pack_uint32 (dbus_uint32_t value, dbus_uint32_t _dbus_unpack_uint32 (int byte_order, const unsigned char *data); - -dbus_bool_t _dbus_marshal_double (DBusString *str, - int byte_order, - double value); -dbus_bool_t _dbus_marshal_int32 (DBusString *str, - int byte_order, - dbus_int32_t value); -dbus_bool_t _dbus_marshal_uint32 (DBusString *str, - int byte_order, - dbus_uint32_t value); -dbus_bool_t _dbus_marshal_string (DBusString *str, - int byte_order, - const char *value); -dbus_bool_t _dbus_marshal_byte_array (DBusString *str, - int byte_order, - const unsigned char *value, - int len); + +dbus_bool_t _dbus_marshal_int32 (DBusString *str, + int byte_order, + dbus_int32_t value); +dbus_bool_t _dbus_marshal_uint32 (DBusString *str, + int byte_order, + dbus_uint32_t value); +dbus_bool_t _dbus_marshal_double (DBusString *str, + int byte_order, + double value); +dbus_bool_t _dbus_marshal_string (DBusString *str, + int byte_order, + const char *value); +dbus_bool_t _dbus_marshal_byte_array (DBusString *str, + int byte_order, + const unsigned char *value, + int len); +dbus_bool_t _dbus_marshal_int32_array (DBusString *str, + int byte_order, + const dbus_int32_t *value, + int len); +dbus_bool_t _dbus_marshal_uint32_array (DBusString *str, + int byte_order, + const dbus_uint32_t *value, + int len); +dbus_bool_t _dbus_marshal_double_array (DBusString *str, + int byte_order, + const double *value, + int len); +dbus_bool_t _dbus_marshal_string_array (DBusString *str, + int byte_order, + const char **value, + int len); double _dbus_demarshal_double (DBusString *str, int byte_order, @@ -115,7 +131,26 @@ unsigned char *_dbus_demarshal_byte_array (DBusString *str, int pos, int *new_pos, int *array_len); - +dbus_int32_t *_dbus_demarshal_int32_array (DBusString *str, + int byte_order, + int pos, + int *new_pos, + int *array_len); +dbus_uint32_t *_dbus_demarshal_uint32_array (DBusString *str, + int byte_order, + int pos, + int *new_pos, + int *array_len); +double *_dbus_demarshal_double_array (DBusString *str, + int byte_order, + int pos, + int *new_pos, + int *array_len); +char **_dbus_demarshal_string_array (DBusString *str, + int byte_order, + int pos, + int *new_pos, + int *array_len); dbus_bool_t _dbus_marshal_get_field_end_pos (DBusString *str, int byte_order, |