summaryrefslogtreecommitdiffstats
path: root/dbus/dbus-marshal-recursive.h
diff options
context:
space:
mode:
authorHavoc Pennington <hp@redhat.com>2005-01-03 07:15:38 +0000
committerHavoc Pennington <hp@redhat.com>2005-01-03 07:15:38 +0000
commitc7e05f9ca4ff7ab0c8499b2059004dd38d2c8784 (patch)
tree999cb96a520bf5ceb5fea2ffbd1b924e316e562f /dbus/dbus-marshal-recursive.h
parentec8e14cfd591aa020b199161bacb01d90c6fa158 (diff)
finish off my TODO list for stuff needed to port dbus-message.c. Next
step is to do so.
Diffstat (limited to 'dbus/dbus-marshal-recursive.h')
-rw-r--r--dbus/dbus-marshal-recursive.h17
1 files changed, 9 insertions, 8 deletions
diff --git a/dbus/dbus-marshal-recursive.h b/dbus/dbus-marshal-recursive.h
index 025c3e04..765ee56b 100644
--- a/dbus/dbus-marshal-recursive.h
+++ b/dbus/dbus-marshal-recursive.h
@@ -151,10 +151,9 @@ int _dbus_type_reader_get_current_type (const DBusTypeReader *
dbus_bool_t _dbus_type_reader_array_is_empty (const DBusTypeReader *reader);
void _dbus_type_reader_read_basic (const DBusTypeReader *reader,
void *value);
-dbus_bool_t _dbus_type_reader_read_array_of_basic (const DBusTypeReader *reader,
- int type,
- void **array,
- int *array_len);
+void _dbus_type_reader_read_fixed_array (const DBusTypeReader *reader,
+ void *value,
+ int *n_elements);
void _dbus_type_reader_recurse (DBusTypeReader *reader,
DBusTypeReader *subreader);
dbus_bool_t _dbus_type_reader_next (DBusTypeReader *reader);
@@ -166,6 +165,8 @@ void _dbus_type_reader_get_signature (const DBusTypeReader *
dbus_bool_t _dbus_type_reader_set_basic (DBusTypeReader *reader,
const void *value,
const DBusTypeReader *realign_root);
+dbus_bool_t _dbus_type_reader_delete (DBusTypeReader *reader,
+ const DBusTypeReader *realign_root);
dbus_bool_t _dbus_type_reader_greater_than (const DBusTypeReader *lhs,
const DBusTypeReader *rhs);
@@ -184,10 +185,10 @@ void _dbus_type_writer_init_values_only (DBusTypeWriter *write
dbus_bool_t _dbus_type_writer_write_basic (DBusTypeWriter *writer,
int type,
const void *value);
-dbus_bool_t _dbus_type_writer_write_array (DBusTypeWriter *writer,
- int type,
- const void *array,
- int array_len);
+dbus_bool_t _dbus_type_writer_write_fixed_array (DBusTypeWriter *writer,
+ int element_type,
+ const void *value,
+ int n_elements);
dbus_bool_t _dbus_type_writer_recurse (DBusTypeWriter *writer,
int container_type,
const DBusString *contained_type,