diff options
author | Havoc Pennington <hp@redhat.com> | 2004-12-30 23:34:23 +0000 |
---|---|---|
committer | Havoc Pennington <hp@redhat.com> | 2004-12-30 23:34:23 +0000 |
commit | 00999397cef16fa989d055f52a3974f5897ca3b1 (patch) | |
tree | 22a80e7ee362f001c98160488d9453efaceb5d67 /dbus/dbus-marshal-recursive.h | |
parent | 6e492b1ba11069375fd8c7eeeb74ad7d2ed88638 (diff) | |
download | dbus-00999397cef16fa989d055f52a3974f5897ca3b1.tar.gz |
- add variant reader
- further squish the iterator structs
Diffstat (limited to 'dbus/dbus-marshal-recursive.h')
-rw-r--r-- | dbus/dbus-marshal-recursive.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/dbus/dbus-marshal-recursive.h b/dbus/dbus-marshal-recursive.h index ef71831e..8e50fdc9 100644 --- a/dbus/dbus-marshal-recursive.h +++ b/dbus/dbus-marshal-recursive.h @@ -37,7 +37,8 @@ typedef struct DBusTypeReaderClass DBusTypeReaderClass; struct DBusTypeReader { - int byte_order; + dbus_uint32_t byte_order : 8; + const DBusString *type_str; int type_pos; const DBusString *value_str; @@ -60,15 +61,16 @@ struct DBusTypeReader struct DBusTypeWriter { - int byte_order; + dbus_uint32_t byte_order : 8; + + dbus_uint32_t container_type : 8; + + dbus_uint32_t type_pos_is_expectation : 1; /* type_pos is an insertion point or an expected next type */ DBusString *type_str; int type_pos; DBusString *value_str; int value_pos; - dbus_uint32_t type_pos_is_expectation : 1; /* type_pos is an insertion point or an expected next type */ - - dbus_uint32_t container_type : 8; union { struct { |