chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
util: unify reading of /proc/cmdline
[elogind.git]
/
src
/
core
/
unit.c
diff --git
a/src/core/unit.c
b/src/core/unit.c
index 4b9771076aa36539a7ff1423094b19322c299c37..e19d281aa7eab6aad84ac9a15a48c74b24748c1d 100644
(file)
--- a/
src/core/unit.c
+++ b/
src/core/unit.c
@@
-171,7
+171,7
@@
int unit_add_name(Unit *u, const char *text) {
u->id = s;
u->instance = i;
u->id = s;
u->instance = i;
- LIST_PREPEND(
Unit,
units_by_type, u->manager->units_by_type[t], u);
+ LIST_PREPEND(units_by_type, u->manager->units_by_type[t], u);
if (UNIT_VTABLE(u)->init)
UNIT_VTABLE(u)->init(u);
if (UNIT_VTABLE(u)->init)
UNIT_VTABLE(u)->init(u);
@@
-284,7
+284,7
@@
void unit_add_to_load_queue(Unit *u) {
if (u->load_state != UNIT_STUB || u->in_load_queue)
return;
if (u->load_state != UNIT_STUB || u->in_load_queue)
return;
- LIST_PREPEND(
Unit,
load_queue, u->manager->load_queue, u);
+ LIST_PREPEND(load_queue, u->manager->load_queue, u);
u->in_load_queue = true;
}
u->in_load_queue = true;
}
@@
-294,7
+294,7
@@
void unit_add_to_cleanup_queue(Unit *u) {
if (u->in_cleanup_queue)
return;
if (u->in_cleanup_queue)
return;
- LIST_PREPEND(
Unit,
cleanup_queue, u->manager->cleanup_queue, u);
+ LIST_PREPEND(cleanup_queue, u->manager->cleanup_queue, u);
u->in_cleanup_queue = true;
}
u->in_cleanup_queue = true;
}
@@
-307,7
+307,7
@@
void unit_add_to_gc_queue(Unit *u) {
if (unit_check_gc(u))
return;
if (unit_check_gc(u))
return;
- LIST_PREPEND(
Unit,
gc_queue, u->manager->gc_queue, u);
+ LIST_PREPEND(gc_queue, u->manager->gc_queue, u);
u->in_gc_queue = true;
u->manager->n_in_gc_queue ++;
u->in_gc_queue = true;
u->manager->n_in_gc_queue ++;
@@
-326,7
+326,7
@@
void unit_add_to_dbus_queue(Unit *u) {
return;
}
return;
}
- LIST_PREPEND(
Unit,
dbus_queue, u->manager->dbus_unit_queue, u);
+ LIST_PREPEND(dbus_queue, u->manager->dbus_unit_queue, u);
u->in_dbus_queue = true;
}
u->in_dbus_queue = true;
}
@@
-439,24
+439,24
@@
void unit_free(Unit *u) {
bidi_set_free(u, u->dependencies[d]);
if (u->type != _UNIT_TYPE_INVALID)
bidi_set_free(u, u->dependencies[d]);
if (u->type != _UNIT_TYPE_INVALID)
- LIST_REMOVE(
Unit,
units_by_type, u->manager->units_by_type[u->type], u);
+ LIST_REMOVE(units_by_type, u->manager->units_by_type[u->type], u);
if (u->in_load_queue)
if (u->in_load_queue)
- LIST_REMOVE(
Unit,
load_queue, u->manager->load_queue, u);
+ LIST_REMOVE(load_queue, u->manager->load_queue, u);
if (u->in_dbus_queue)
if (u->in_dbus_queue)
- LIST_REMOVE(
Unit,
dbus_queue, u->manager->dbus_unit_queue, u);
+ LIST_REMOVE(dbus_queue, u->manager->dbus_unit_queue, u);
if (u->in_cleanup_queue)
if (u->in_cleanup_queue)
- LIST_REMOVE(
Unit,
cleanup_queue, u->manager->cleanup_queue, u);
+ LIST_REMOVE(cleanup_queue, u->manager->cleanup_queue, u);
if (u->in_gc_queue) {
if (u->in_gc_queue) {
- LIST_REMOVE(
Unit,
gc_queue, u->manager->gc_queue, u);
+ LIST_REMOVE(gc_queue, u->manager->gc_queue, u);
u->manager->n_in_gc_queue--;
}
if (u->in_cgroup_queue)
u->manager->n_in_gc_queue--;
}
if (u->in_cgroup_queue)
- LIST_REMOVE(
Unit,
cgroup_queue, u->manager->cgroup_queue, u);
+ LIST_REMOVE(cgroup_queue, u->manager->cgroup_queue, u);
if (u->cgroup_path) {
hashmap_remove(u->manager->cgroup_unit, u->cgroup_path);
if (u->cgroup_path) {
hashmap_remove(u->manager->cgroup_unit, u->cgroup_path);
@@
-952,7
+952,7
@@
int unit_load(Unit *u) {
assert(u);
if (u->in_load_queue) {
assert(u);
if (u->in_load_queue) {
- LIST_REMOVE(
Unit,
load_queue, u->manager->load_queue, u);
+ LIST_REMOVE(load_queue, u->manager->load_queue, u);
u->in_load_queue = false;
}
u->in_load_queue = false;
}
@@
-2670,7
+2670,7
@@
Unit* unit_ref_set(UnitRef *ref, Unit *u) {
unit_ref_unset(ref);
ref->unit = u;
unit_ref_unset(ref);
ref->unit = u;
- LIST_PREPEND(
UnitRef,
refs, u->refs, ref);
+ LIST_PREPEND(refs, u->refs, ref);
return u;
}
return u;
}
@@
-2680,7
+2680,7
@@
void unit_ref_unset(UnitRef *ref) {
if (!ref->unit)
return;
if (!ref->unit)
return;
- LIST_REMOVE(
UnitRef,
refs, ref->unit->refs, ref);
+ LIST_REMOVE(refs, ref->unit->refs, ref);
ref->unit = NULL;
}
ref->unit = NULL;
}
@@
-2908,6
+2908,9
@@
int unit_remove_drop_in(Unit *u, UnitSetPropertiesMode mode, const char *name) {
return 0;
r = drop_in_file(u, mode, name, &p, &q);
return 0;
r = drop_in_file(u, mode, name, &p, &q);
+ if (r < 0)
+ return r;
+
if (unlink(q) < 0)
r = errno == ENOENT ? 0 : -errno;
else
if (unlink(q) < 0)
r = errno == ENOENT ? 0 : -errno;
else