SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

core: use automatic cleanup more

Browse Source
This commit is contained in:
David Tardon
2018-05-12 18:29:41 +02:00
committed by Zbigniew Jędrzejewski-Szmek
parent fee09fb7ac
commit 95f14a3e21
3 changed files with 11 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/device.c
+4 -8
View File
@@ -704,7 +704,7 @@ static Unit *device_following(Unit *u) {
static int device_following_set(Unit *u, Set **_set) {
Device *d = DEVICE(u), *other;
Set *set;
_cleanup_(set_freep) Set *set = NULL;
int r;
assert(d);
@@ -722,21 +722,17 @@ static int device_following_set(Unit *u, Set **_set) {
LIST_FOREACH_AFTER(same_sysfs, other, d) {
r = set_put(set, other);
if (r < 0)
goto fail;
return r;
}
LIST_FOREACH_BEFORE(same_sysfs, other, d) {
r = set_put(set, other);
if (r < 0)
goto fail;
return r;
}
*_set = set;
*_set = TAKE_PTR(set);
return 1;
fail:
set_free(set);
return r;
}
static void device_shutdown(Manager *m) {
src/core/swap.c
+3 -7
View File
@@ -1240,7 +1240,7 @@ static Unit *swap_following(Unit *u) {
static int swap_following_set(Unit *u, Set **_set) {
Swap *s = SWAP(u), *other;
Set *set;
_cleanup_(set_freep) Set *set = NULL;
int r;
assert(s);
@@ -1258,15 +1258,11 @@ static int swap_following_set(Unit *u, Set **_set) {
LIST_FOREACH_OTHERS(same_devnode, other, s) {
r = set_put(set, other);
if (r < 0)
goto fail;
return r;
}
*_set = set;
*_set = TAKE_PTR(set);
return 1;
fail:
set_free(set);
return r;
}
static void swap_shutdown(Manager *m) {
src/core/unit.c
+4 -8
View File
@@ -3815,7 +3815,7 @@ int unit_kill(Unit *u, KillWho w, int signo, sd_bus_error *error) {
}
static Set *unit_pid_set(pid_t main_pid, pid_t control_pid) {
Set *pid_set;
_cleanup_(set_freep) Set *pid_set = NULL;
int r;
pid_set = set_new(NULL);
@@ -3826,20 +3826,16 @@ static Set *unit_pid_set(pid_t main_pid, pid_t control_pid) {
if (main_pid > 0) {
r = set_put(pid_set, PID_TO_PTR(main_pid));
if (r < 0)
goto fail;
return NULL;
}
if (control_pid > 0) {
r = set_put(pid_set, PID_TO_PTR(control_pid));
if (r < 0)
goto fail;
return NULL;
}
return pid_set;
fail:
set_free(pid_set);
return NULL;
return TAKE_PTR(pid_set);
}
int unit_kill_common(