diff options
| author | Lennart Poettering <lennart@poettering.net> | 2013-10-11 20:32:16 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2013-10-11 20:32:16 +0200 |
| commit | 77a874a3fb6f65d2308c20827f005c43bb075752 (patch) | |
| tree | 077579630bf03b004f2ff998d13f9eab458737aa /src/libsystemd-bus/bus-introspect.c | |
| parent | 992c052c34d180dd9fe6bd4f89fff3a481a729dc (diff) | |
bus: don't rely on gccisms/c11 in public header files.
One day sd-bus.h should become a public header file. We generally try to
be conservative in language features we use in public headers (much
unlike in private code), hence don't make use of anonymous unions in
structs for the vtable definitions.
Diffstat (limited to 'src/libsystemd-bus/bus-introspect.c')
| -rw-r--r-- | src/libsystemd-bus/bus-introspect.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/libsystemd-bus/bus-introspect.c b/src/libsystemd-bus/bus-introspect.c index 8dc9a2de15..c04d9b51f7 100644 --- a/src/libsystemd-bus/bus-introspect.c +++ b/src/libsystemd-bus/bus-introspect.c @@ -128,9 +128,9 @@ int introspect_write_interface(struct introspect *i, const char *interface, cons break; case _SD_BUS_VTABLE_METHOD: - fprintf(i->f, " <method name=\"%s\">\n", v->method.member); - introspect_write_arguments(i, v->method.signature, "in"); - introspect_write_arguments(i, v->method.result, "out"); + fprintf(i->f, " <method name=\"%s\">\n", v->x.method.member); + introspect_write_arguments(i, v->x.method.signature, "in"); + introspect_write_arguments(i, v->x.method.result, "out"); introspect_write_flags(i, v->type, v->flags); fputs(" </method>\n", i->f); break; @@ -138,16 +138,16 @@ int introspect_write_interface(struct introspect *i, const char *interface, cons case _SD_BUS_VTABLE_PROPERTY: case _SD_BUS_VTABLE_WRITABLE_PROPERTY: fprintf(i->f, " <property name=\"%s\" type=\"%s\" access=\"%s\">\n", - v->property.member, - v->property.signature, + v->x.property.member, + v->x.property.signature, v->type == _SD_BUS_VTABLE_WRITABLE_PROPERTY ? "readwrite" : "read"); introspect_write_flags(i, v->type, v->flags); fputs(" </property>\n", i->f); break; case _SD_BUS_VTABLE_SIGNAL: - fprintf(i->f, " <signal name=\"%s\">\n", v->signal.member); - introspect_write_arguments(i, v->signal.signature, NULL); + fprintf(i->f, " <signal name=\"%s\">\n", v->x.signal.member); + introspect_write_arguments(i, v->x.signal.signature, NULL); introspect_write_flags(i, v->type, v->flags); fputs(" </signal>\n", i->f); break; |