diff options
| -rw-r--r-- | fixme | 2 | ||||
| -rw-r--r-- | src/dbus-unit.h | 4 | ||||
| -rw-r--r-- | src/unit.c | 14 |
3 files changed, 9 insertions, 11 deletions
@@ -93,8 +93,6 @@ * readahead() vs. fadvise() vs. ioprio -* "unneeded" vs. "uneeded" - * properly handle multiple inotify events per read() in path.c and util.c * tmpwatch: what does "-umc" actually mean? diff --git a/src/dbus-unit.h b/src/dbus-unit.h index 16a7247d98..800498b8f8 100644 --- a/src/dbus-unit.h +++ b/src/dbus-unit.h @@ -88,7 +88,7 @@ " <property name=\"CanIsolate\" type=\"b\" access=\"read\"/>\n" \ " <property name=\"Job\" type=\"(uo)\" access=\"read\"/>\n" \ " <property name=\"RecursiveStop\" type=\"b\" access=\"read\"/>\n" \ - " <property name=\"StopWhenUneeded\" type=\"b\" access=\"read\"/>\n" \ + " <property name=\"StopWhenUnneeded\" type=\"b\" access=\"read\"/>\n" \ " <property name=\"RefuseManualStart\" type=\"b\" access=\"read\"/>\n" \ " <property name=\"RefuseManualStop\" type=\"b\" access=\"read\"/>\n" \ " <property name=\"DefaultDependencies\" type=\"b\" access=\"read\"/>\n" \ @@ -130,7 +130,7 @@ { "org.freedesktop.systemd1.Unit", "CanIsolate", bus_unit_append_can_isolate, "b", u }, \ { "org.freedesktop.systemd1.Unit", "Job", bus_unit_append_job, "(uo)", u }, \ { "org.freedesktop.systemd1.Unit", "RecursiveStop", bus_property_append_bool, "b", &u->meta.recursive_stop }, \ - { "org.freedesktop.systemd1.Unit", "StopWhenUneeded", bus_property_append_bool, "b", &u->meta.stop_when_unneeded }, \ + { "org.freedesktop.systemd1.Unit", "StopWhenUnneeded", bus_property_append_bool, "b", &u->meta.stop_when_unneeded }, \ { "org.freedesktop.systemd1.Unit", "RefuseManualStart", bus_property_append_bool, "b", &u->meta.refuse_manual_start }, \ { "org.freedesktop.systemd1.Unit", "RefuseManualStop", bus_property_append_bool, "b", &u->meta.refuse_manual_stop }, \ { "org.freedesktop.systemd1.Unit", "AllowIsolate", bus_property_append_bool, "b", &u->meta.allow_isolate }, \ diff --git a/src/unit.c b/src/unit.c index 5960c277b7..0a8ee61900 100644 --- a/src/unit.c +++ b/src/unit.c @@ -930,7 +930,7 @@ bool unit_can_reload(Unit *u) { return UNIT_VTABLE(u)->can_reload(u); } -static void unit_check_uneeded(Unit *u) { +static void unit_check_unneeded(Unit *u) { Iterator i; Unit *other; @@ -1012,19 +1012,19 @@ static void retroactively_stop_dependencies(Unit *u) { /* Garbage collect services that might not be needed anymore, if enabled */ SET_FOREACH(other, u->meta.dependencies[UNIT_REQUIRES], i) if (!UNIT_IS_INACTIVE_OR_DEACTIVATING(unit_active_state(other))) - unit_check_uneeded(other); + unit_check_unneeded(other); SET_FOREACH(other, u->meta.dependencies[UNIT_REQUIRES_OVERRIDABLE], i) if (!UNIT_IS_INACTIVE_OR_DEACTIVATING(unit_active_state(other))) - unit_check_uneeded(other); + unit_check_unneeded(other); SET_FOREACH(other, u->meta.dependencies[UNIT_WANTS], i) if (!UNIT_IS_INACTIVE_OR_DEACTIVATING(unit_active_state(other))) - unit_check_uneeded(other); + unit_check_unneeded(other); SET_FOREACH(other, u->meta.dependencies[UNIT_REQUISITE], i) if (!UNIT_IS_INACTIVE_OR_DEACTIVATING(unit_active_state(other))) - unit_check_uneeded(other); + unit_check_unneeded(other); SET_FOREACH(other, u->meta.dependencies[UNIT_REQUISITE_OVERRIDABLE], i) if (!UNIT_IS_INACTIVE_OR_DEACTIVATING(unit_active_state(other))) - unit_check_uneeded(other); + unit_check_unneeded(other); } void unit_notify(Unit *u, UnitActiveState os, UnitActiveState ns) { @@ -1202,7 +1202,7 @@ void unit_notify(Unit *u, UnitActiveState os, UnitActiveState ns) { /* Maybe we finished startup and are now ready for being * stopped because unneeded? */ - unit_check_uneeded(u); + unit_check_unneeded(u); unit_add_to_dbus_queue(u); unit_add_to_gc_queue(u); |