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
+3 -6
View File
@@ -424,10 +424,8 @@ static int property_get_syscall_filter(
if (r < 0)
return -ENOMEM;
}
} else {
s = name;
name = NULL;
}
} else
s = TAKE_PTR(name);
r = strv_consume(&l, s);
if (r < 0)
@@ -1125,8 +1123,7 @@ int bus_set_transient_exec_command(
return -ENOMEM;
}
c->argv = argv;
argv = NULL;
c->argv = TAKE_PTR(argv);
c->flags = b ? EXEC_COMMAND_IGNORE_FAILURE : 0;