SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bus: support implicit serialization of strv string arrays within vtables

Browse Source
This commit is contained in:
Lennart Poettering
2013-11-05 01:13:05 +01:00
parent c9b6cb28c3
commit c13c7de3bf
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libsystemd-bus/bus-objects.c
+5 -7
View File
@@ -312,7 +312,6 @@ static int invoke_property_get(
sd_bus_error *error,
void *userdata) {
int r;
const void *p;
assert(bus);
@@ -327,6 +326,9 @@ static int invoke_property_get(
/* Automatic handling if no callback is defined. */
if (streq(v->x.property.signature, "as"))
return sd_bus_message_append_strv(m, *(char***) userdata);
assert(signature_is_single(v->x.property.signature, false));
assert(bus_type_is_basic(v->x.property.signature[0]));
@@ -347,11 +349,7 @@ static int invoke_property_get(
break;
}
r = sd_bus_message_append_basic(m, v->x.property.signature[0], p);
if (r < 0)
return r;
return 1;
return sd_bus_message_append_basic(m, v->x.property.signature[0], p);
}
static int invoke_property_set(
@@ -1587,7 +1585,7 @@ static int add_object_vtable_internal(
if (!member_name_is_valid(v->x.property.member) ||
!signature_is_single(v->x.property.signature, false) ||
!(v->x.property.get || bus_type_is_basic(v->x.property.signature[0])) ||
!(v->x.property.get || bus_type_is_basic(v->x.property.signature[0]) || streq(v->x.property.signature, "as")) ||
v->flags & SD_BUS_VTABLE_METHOD_NO_REPLY ||
(v->flags & SD_BUS_VTABLE_PROPERTY_INVALIDATE_ONLY && !(v->flags & SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE))) {
r = -EINVAL;