From 718db96199eb307751264e4163555662c9a389fa Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 19 Nov 2013 21:12:59 +0100 Subject: core: convert PID 1 to libsystemd-bus This patch converts PID 1 to libsystemd-bus and thus drops the dependency on libdbus. The only remaining code using libdbus is a test case that validates our bus marshalling against libdbus' marshalling, and this dependency can be turned off. This patch also adds a couple of things to libsystem-bus, that are necessary to make the port work: - Synthesizing of "Disconnected" messages when bus connections are severed. - Support for attaching multiple vtables for the same interface on the same path. This patch also fixes the SetDefaultTarget() and GetDefaultTarget() bus calls which used an inappropriate signature. As a side effect we will now generate PropertiesChanged messages which carry property contents, rather than just invalidation information. --- src/libsystemd-bus/bus-introspect.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'src/libsystemd-bus/bus-introspect.c') diff --git a/src/libsystemd-bus/bus-introspect.c b/src/libsystemd-bus/bus-introspect.c index 9a49e431c0..4c6031729a 100644 --- a/src/libsystemd-bus/bus-introspect.c +++ b/src/libsystemd-bus/bus-introspect.c @@ -111,13 +111,10 @@ static int introspect_write_arguments(struct introspect *i, const char *signatur } } -int introspect_write_interface(struct introspect *i, const char *interface, const sd_bus_vtable *v) { +int introspect_write_interface(struct introspect *i, const sd_bus_vtable *v) { assert(i); - assert(interface); assert(v); - fprintf(i->f, " \n", interface); - for (; v->type != _SD_BUS_VTABLE_END; v++) { switch (v->type) { @@ -155,7 +152,6 @@ int introspect_write_interface(struct introspect *i, const char *interface, cons } - fputs(" \n", i->f); return 0; } -- cgit v1.2.3-54-g00ecf