summaryrefslogtreecommitdiffstats
path: root/dbus/dbus-marshal-recursive.c
diff options
context:
space:
mode:
authorHavoc Pennington <hp@redhat.com>2005-01-02 02:47:51 +0000
committerHavoc Pennington <hp@redhat.com>2005-01-02 02:47:51 +0000
commitdf652bd9a1f170b9a1af193b0b94136b7be690db (patch)
tree0b68beb5a8e22f317ab986253cbb773568b3bcf0 /dbus/dbus-marshal-recursive.c
parent721e6c7abcfa2f3d7a320d612539a501e8d485af (diff)
change strings to be marshaled consistently with the other basic types (address of the value passed in, so char**)
Diffstat (limited to 'dbus/dbus-marshal-recursive.c')
-rw-r--r--dbus/dbus-marshal-recursive.c15
1 files changed, 9 insertions, 6 deletions
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