summaryrefslogtreecommitdiffstats
path: root/dbus/dbus-marshal.h
diff options
context:
space:
mode:
authorAnders Carlsson <andersca@codefactory.se>2003-01-07 23:08:41 +0000
committerAnders Carlsson <andersca@codefactory.se>2003-01-07 23:08:41 +0000
commit000d29a283b06517f0cfb599516a390e3afbf25c (patch)
tree256cc7e3e73cb5c71f1eaa13da25fb7971b9ce27 /dbus/dbus-marshal.h
parent1f23ea99b37bfc8197f1c6a376f9afe08037f0f6 (diff)
2003-01-08 Anders Carlsson <andersca@codefactory.se>
* dbus/dbus-internals.c: (_dbus_type_to_string): New function that returns a string describing a type. * dbus/dbus-marshal.c: (_dbus_demarshal_byte_array): * dbus/dbus-marshal.h: * dbus/dbus-message.c: (dbus_message_get_fields_valist), (dbus_message_iter_get_field_type), (dbus_message_iter_get_double), (dbus_message_iter_get_byte_array): * dbus/dbus-message.h: Add new convenience functions for appending and getting message fields. Also add demarshalling routines for byte arrays.
Diffstat (limited to 'dbus/dbus-marshal.h')
-rw-r--r--dbus/dbus-marshal.h38
1 files changed, 22 insertions, 16 deletions
diff --git a/dbus/dbus-marshal.h b/dbus/dbus-marshal.h
index 1f5e27a8..4f1ba37e 100644
--- a/dbus/dbus-marshal.h
+++ b/dbus/dbus-marshal.h
@@ -63,22 +63,28 @@ dbus_bool_t _dbus_marshal_byte_array (DBusString *str,
const unsigned char *value,
int len);
-double _dbus_demarshal_double (DBusString *str,
- int byte_order,
- int pos,
- int *new_pos);
-dbus_int32_t _dbus_demarshal_int32 (DBusString *str,
- int byte_order,
- int pos,
- int *new_pos);
-dbus_uint32_t _dbus_demarshal_uint32 (DBusString *str,
- int byte_order,
- int pos,
- int *new_pos);
-char * _dbus_demarshal_string (DBusString *str,
- int byte_order,
- int pos,
- int *new_pos);
+double _dbus_demarshal_double (DBusString *str,
+ int byte_order,
+ int pos,
+ int *new_pos);
+dbus_int32_t _dbus_demarshal_int32 (DBusString *str,
+ int byte_order,
+ int pos,
+ int *new_pos);
+dbus_uint32_t _dbus_demarshal_uint32 (DBusString *str,
+ int byte_order,
+ int pos,
+ int *new_pos);
+char * _dbus_demarshal_string (DBusString *str,
+ int byte_order,
+ int pos,
+ int *new_pos);
+unsigned char *_dbus_demarshal_byte_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,