From df652bd9a1f170b9a1af193b0b94136b7be690db Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Sun, 2 Jan 2005 02:47:51 +0000 Subject: change strings to be marshaled consistently with the other basic types (address of the value passed in, so char**) --- dbus/dbus-marshal-recursive.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'dbus/dbus-marshal-recursive.c') diff --git a/dbus/dbus-marshal-recursive.c b/dbus/dbus-marshal-recursive.c index ba5d2bff..7829b452 100644 --- a/dbus/dbus-marshal-recursive.c +++ b/dbus/dbus-marshal-recursive.c @@ -2871,13 +2871,14 @@ string_write_value (TestTypeNode *node, int seed) { char buf[MAX_SAMPLE_STRING_LEN]; + const char *v_string = buf; string_from_seed (buf, node->klass->subclass_detail, seed); - + return _dbus_type_writer_write_basic (writer, node->klass->typecode, - buf); + &v_string); } static dbus_bool_t @@ -3063,12 +3064,13 @@ object_path_write_value (TestTypeNode *node, int seed) { char buf[MAX_SAMPLE_OBJECT_PATH_LEN]; - + const char *v_string = buf; + object_path_from_seed (buf, seed); return _dbus_type_writer_write_basic (writer, node->klass->typecode, - buf); + &v_string); } static dbus_bool_t @@ -3129,12 +3131,13 @@ signature_write_value (TestTypeNode *node, int seed) { char buf[MAX_SAMPLE_SIGNATURE_LEN]; - + const char *v_string = buf; + signature_from_seed (buf, seed); return _dbus_type_writer_write_basic (writer, node->klass->typecode, - buf); + &v_string); } static dbus_bool_t -- cgit