diff options
| author | Havoc Pennington <hp@redhat.com> | 2004-12-19 16:23:09 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@redhat.com> | 2004-12-19 16:23:09 +0000 |
| commit | 617e73f7631e605fc9ebf6a67042a1f451b97850 (patch) | |
| tree | a83539d7c9c92f422d2dca3026c8e19f522a0766 /dbus/dbus-marshal-recursive.h | |
| parent | 305a8d4d988a1011982e284e358165d3368067cc (diff) | |
2004-12-19 Havoc Pennington <hp@redhat.com>
* dbus/dbus-string.c (_dbus_string_insert_4_aligned)
(_dbus_string_insert_8_aligned): new functions
* dbus/dbus-string.c (_dbus_string_alloc_space): new function
Diffstat (limited to 'dbus/dbus-marshal-recursive.h')
| -rw-r--r-- | dbus/dbus-marshal-recursive.h | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/dbus/dbus-marshal-recursive.h b/dbus/dbus-marshal-recursive.h index 19960ec8..ed70a827 100644 --- a/dbus/dbus-marshal-recursive.h +++ b/dbus/dbus-marshal-recursive.h @@ -67,30 +67,28 @@ struct DBusTypeWriter int type_pos; DBusString *value_str; int value_pos; + int container_type; }; typedef struct DBusTypeWriter DBusTypeWriter; -void _dbus_type_reader_init (DBusTypeReader *reader, - int byte_order, - const DBusString *type_str, - int type_pos, - const DBusString *value_str, - int value_pos); -int _dbus_type_reader_get_value_end (DBusTypeReader *reader); -int _dbus_type_reader_get_type_end (DBusTypeReader *reader); -int _dbus_type_reader_get_current_type (DBusTypeReader *reader); -int _dbus_type_reader_get_array_type (DBusTypeReader *reader); -void _dbus_type_reader_read_basic (DBusTypeReader *reader, - void *value); -dbus_bool_t _dbus_type_reader_read_array (DBusTypeReader *reader, - int type, - void **array, - int *array_len); -void _dbus_type_reader_recurse (DBusTypeReader *reader); -void _dbus_type_reader_unrecurse (DBusTypeReader *reader); -dbus_bool_t _dbus_type_reader_next (DBusTypeReader *reader); - +void _dbus_type_reader_init (DBusTypeReader *reader, + int byte_order, + const DBusString *type_str, + int type_pos, + const DBusString *value_str, + int value_pos); +int _dbus_type_reader_get_current_type (DBusTypeReader *reader); +int _dbus_type_reader_get_array_type (DBusTypeReader *reader); +void _dbus_type_reader_read_basic (DBusTypeReader *reader, + void *value); +dbus_bool_t _dbus_type_reader_read_array_of_basic (DBusTypeReader *reader, + int type, + void **array, + int *array_len); +void _dbus_type_reader_recurse (DBusTypeReader *reader, + DBusTypeReader *subreader); +dbus_bool_t _dbus_type_reader_next (DBusTypeReader *reader); void _dbus_type_writer_init (DBusTypeWriter *writer, int byte_order, @@ -106,7 +104,9 @@ dbus_bool_t _dbus_type_writer_write_array (DBusTypeWriter *writer, const void *array, int array_len); dbus_bool_t _dbus_type_writer_recurse (DBusTypeWriter *writer, - int container_type); -dbus_bool_t _dbus_type_writer_unrecurse (DBusTypeWriter *writer); + int container_type, + DBusTypeWriter *sub); +dbus_bool_t _dbus_type_writer_unrecurse (DBusTypeWriter *writer, + DBusTypeWriter *sub); #endif /* DBUS_MARSHAL_RECURSIVE_H */ |