diff options
| author | Tom Gundersen <teg@jklm.no> | 2015-10-27 16:55:16 +0100 |
|---|---|---|
| committer | Tom Gundersen <teg@jklm.no> | 2015-10-27 16:55:16 +0100 |
| commit | 0d0696812980d8f41c54739ad73716a233a2fa7c (patch) | |
| tree | 217d98308a3039e106efde5fd6a7b6a657916950 /src/core/unit.c | |
| parent | f47fc3ffc4b69a00083a76308f777b52afb8efbf (diff) | |
| parent | 7760171904ef007f19e8f46aa240a00e382d5b74 (diff) | |
Merge pull request #1691 from poettering/util-lib-3
split up util.h and macro.h into even more bits
Diffstat (limited to 'src/core/unit.c')
| -rw-r--r-- | src/core/unit.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/core/unit.c b/src/core/unit.c index 572b1c1b78..8d56401231 100644 --- a/src/core/unit.c +++ b/src/core/unit.c @@ -28,6 +28,7 @@ #include "sd-id128.h" #include "sd-messages.h" +#include "alloc-util.h" #include "bus-common-errors.h" #include "bus-util.h" #include "cgroup-util.h" @@ -44,10 +45,12 @@ #include "macro.h" #include "missing.h" #include "mkdir.h" +#include "parse-util.h" #include "path-util.h" #include "process-util.h" #include "set.h" #include "special.h" +#include "stat-util.h" #include "string-util.h" #include "strv.h" #include "unit-name.h" @@ -416,12 +419,11 @@ static void unit_remove_transient(Unit *u) { STRV_FOREACH(i, u->dropin_paths) { _cleanup_free_ char *p = NULL; - int r; (void) unlink(*i); - r = path_get_parent(*i, &p); - if (r >= 0) + p = dirname_malloc(*i); + if (p) (void) rmdir(p); } } |