diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2015-05-08 15:37:58 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2015-05-08 15:37:58 +0100 |
| commit | 720e3ccb62ad93b25950a4ed82144c98e8e24db8 (patch) | |
| tree | fbae24877fbdb893d13f56cf2e5a43d249fb4843 | |
| parent | 84b2682eef49a247d15492d8bf826232e41d3216 (diff) | |
| parent | 480f0182fa430e3f5e50e0c719ee0b782cb4aebd (diff) | |
| download | dbus-720e3ccb62ad93b25950a4ed82144c98e8e24db8.tar.gz | |
Merge branch 'dbus-1.8'
| -rw-r--r-- | dbus/dbus-marshal-recursive.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/dbus/dbus-marshal-recursive.c b/dbus/dbus-marshal-recursive.c index de997953..4adfd2e9 100644 --- a/dbus/dbus-marshal-recursive.c +++ b/dbus/dbus-marshal-recursive.c @@ -149,7 +149,6 @@ reader_init (DBusTypeReader *reader, const DBusString *value_str, int value_pos) { - _DBUS_ZERO (*reader); reader->byte_order = byte_order; reader->finished = FALSE; reader->type_str = type_str; @@ -737,11 +736,11 @@ _dbus_type_reader_init (DBusTypeReader *reader, const DBusString *value_str, int value_pos) { + reader->klass = &body_reader_class; + reader_init (reader, byte_order, type_str, type_pos, value_str, value_pos); - reader->klass = &body_reader_class; - #if RECURSIVE_MARSHAL_READ_TRACE _dbus_verbose (" type reader %p init type_pos = %d value_pos = %d remaining sig '%s'\n", reader, reader->type_pos, reader->value_pos, @@ -762,11 +761,11 @@ _dbus_type_reader_init_types_only (DBusTypeReader *reader, const DBusString *type_str, int type_pos) { + reader->klass = &body_types_only_reader_class; + reader_init (reader, DBUS_COMPILER_BYTE_ORDER /* irrelevant */, type_str, type_pos, NULL, _DBUS_INT_MAX /* crashes if we screw up */); - reader->klass = &body_types_only_reader_class; - #if RECURSIVE_MARSHAL_READ_TRACE _dbus_verbose (" type reader %p init types only type_pos = %d remaining sig '%s'\n", reader, reader->type_pos, |