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/shared/install-printf.c | |
parent | man/udevadm: remove superfluous --version from subcommands (#8549) (diff) | |
download | systemd-ae2a15bc14bc448e625ad93fd044bc077ede4b3f.tar.xz systemd-ae2a15bc14bc448e625ad93fd044bc077ede4b3f.zip |
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/shared/install-printf.c')
-rw-r--r-- | src/shared/install-printf.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/shared/install-printf.c b/src/shared/install-printf.c index aaab2e6665..5135d0671e 100644 --- a/src/shared/install-printf.c +++ b/src/shared/install-printf.c @@ -50,10 +50,8 @@ static int specifier_prefix_and_instance(char specifier, void *data, void *userd if (!ans) return -ENOMEM; *ret = ans; - } else { - *ret = prefix; - prefix = NULL; - } + } else + *ret = TAKE_PTR(prefix); return 0; } |