From ae2a15bc14bc448e625ad93fd044bc077ede4b3f Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 22 Mar 2018 16:53:26 +0100 Subject: 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) --- src/vconsole/vconsole-setup.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/vconsole') diff --git a/src/vconsole/vconsole-setup.c b/src/vconsole/vconsole-setup.c index a9cc2bf63c..6bde3da1c8 100644 --- a/src/vconsole/vconsole-setup.c +++ b/src/vconsole/vconsole-setup.c @@ -358,8 +358,7 @@ static int find_source_vc(char **ret_path, unsigned *ret_idx) { /* all checks passed, return this one as a source console */ *ret_idx = i; - *ret_path = path; - path = NULL; + *ret_path = TAKE_PTR(path); ret_fd = fd; fd = -1; return ret_fd; -- cgit v1.2.1