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:
Lennart Poettering
2018-03-22 20:21:42 +01:00
parent 1147eef0b6
commit ae2a15bc14
93 changed files with 215 additions and 379 deletions
+5 -8
View File
@@ -707,10 +707,9 @@ int vtnr_from_tty(const char *tty) {
tty = active;
}
if (tty == active) {
*ret = active;
active = NULL;
} else {
if (tty == active)
*ret = TAKE_PTR(active);
else {
char *tmp;
tmp = strdup(tty);
@@ -778,8 +777,7 @@ int get_kernel_consoles(char ***ret) {
goto fallback;
}
*ret = l;
l = NULL;
*ret = TAKE_PTR(l);
return 0;
@@ -788,8 +786,7 @@ fallback:
if (r < 0)
return r;
*ret = l;
l = NULL;
*ret = TAKE_PTR(l);
return 0;
}