diff options
author | Lennart Poettering <lennart@poettering.net> | 2021-04-26 18:14:07 +0200 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2021-05-25 16:02:00 +0200 |
commit | 12f64221b0af5a9380a840ebeb897c2cd6cff955 (patch) | |
tree | 21a5e28261495ac0680bc46b680b5cc5fc71ce2f /src/core/unit-printf.c | |
parent | 8ddba3f266a1deae3826a80e2d148909b7902020 (diff) | |
download | systemd-12f64221b0af5a9380a840ebeb897c2cd6cff955.tar.gz |
core: add UNIT_GET_SLICE() helper
In a later commit we intend to move the slice logic to use proper
dependencies instead of a "UnitRef" object. This preparatory commit
drops direct use of the slice UnitRef object for a static inline
function UNIT_GET_SLICE() that is both easier to grok, and allows us to
easily replace its internal implementation later on.
Diffstat (limited to 'src/core/unit-printf.c')
-rw-r--r-- | src/core/unit-printf.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/core/unit-printf.c b/src/core/unit-printf.c index ee8b0b3de8..113dd1cc8a 100644 --- a/src/core/unit-printf.c +++ b/src/core/unit-printf.c @@ -132,18 +132,15 @@ static int specifier_cgroup_root(char specifier, const void *data, const void *u } static int specifier_cgroup_slice(char specifier, const void *data, const void *userdata, char **ret) { - const Unit *u = userdata; + const Unit *u = userdata, *slice; char *n; assert(u); bad_specifier(u, specifier); - if (UNIT_ISSET(u->slice)) { - const Unit *slice; - - slice = UNIT_DEREF(u->slice); - + slice = UNIT_GET_SLICE(u); + if (slice) { if (slice->cgroup_path) n = strdup(slice->cgroup_path); else |