From 57020a3abff20f176e9f0cbb982d7977119d6f08 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 6 Jan 2012 23:08:54 +0100 Subject: unit: properly update references to units which are merged When we merge units that some kind of object points to, those pointers might become invalidated, and needs to be updated. Introduce a UnitRef struct which links up all the unit references, to ensure corrected references. At the same time, drop configured_sockets in the Service object, and replace it by proper UNIT_TRIGGERS resp. UNIT_TRIGGERED_BY dependencies, which allow us to simplify a lot of code. --- src/dbus-timer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/dbus-timer.c') diff --git a/src/dbus-timer.c b/src/dbus-timer.c index abcbe6f9be..07d425e20e 100644 --- a/src/dbus-timer.c +++ b/src/dbus-timer.c @@ -107,7 +107,7 @@ static int bus_timer_append_unit(DBusMessageIter *i, const char *property, void assert(property); assert(u); - t = u->timer.unit ? u->timer.unit->meta.id : ""; + t = UNIT_DEREF(u->timer.unit) ? UNIT_DEREF(u->timer.unit)->meta.id : ""; return dbus_message_iter_append_basic(i, DBUS_TYPE_STRING, &t) ? 0 : -ENOMEM; } -- cgit v1.2.3-54-g00ecf