diff options
| author | Lennart Poettering <lennart@poettering.net> | 2018-03-22 16:53:26 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2018-03-22 20:21:42 +0100 |
| commit | ae2a15bc14bc448e625ad93fd044bc077ede4b3f (patch) | |
| tree | e503e6cf3b571d0a150dc2cea7d1838f55aaa6ab /src/sysv-generator | |
| parent | 1147eef0b6a5937526247ff81ca1e5e45205ed16 (diff) | |
| download | systemd-ae2a15bc14bc448e625ad93fd044bc077ede4b3f.tar.gz | |
macro: introduce TAKE_PTR() macro
This macro will read a pointer of any type, return it, and set the
pointer to NULL. This is useful as an explicit concept of passing
ownership of a memory area between pointers.
This takes inspiration from Rust:
https://doc.rust-lang.org/std/option/enum.Option.html#method.take
and was suggested by Alan Jenkins (@sourcejedi).
It drops ~160 lines of code from our codebase, which makes me like it.
Also, I think it clarifies passing of ownership, and thus helps
readability a bit (at least for the initiated who know the new macro)
Diffstat (limited to 'src/sysv-generator')
| -rw-r--r-- | src/sysv-generator/sysv-generator.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/sysv-generator/sysv-generator.c b/src/sysv-generator/sysv-generator.c index 92669c6758..394a04bb88 100644 --- a/src/sysv-generator/sysv-generator.c +++ b/src/sysv-generator/sysv-generator.c @@ -741,8 +741,7 @@ static int acquire_search_path(const char *def, const char *envvar, char ***ret) if (!path_strv_resolve_uniq(l, NULL)) return log_oom(); - *ret = l; - l = NULL; + *ret = TAKE_PTR(l); return 0; } |