mirror of
https://github.com/systemd/systemd.git
synced 2026-08-03 06:30:30 +00:00
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)
This commit is contained in:
@@ -402,8 +402,7 @@ static int get_password(const char *vol, const char *src, usec_t until, bool acc
|
||||
*p = c;
|
||||
}
|
||||
|
||||
*ret = passwords;
|
||||
passwords = NULL;
|
||||
*ret = TAKE_PTR(passwords);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user