diff options
| author | Lennart Poettering <lennart@poettering.net> | 2018-03-22 16:53:26 +0100 |
|---|---|---|
| committer | Sven Eden <yamakuzure@gmx.net> | 2018-08-24 16:47:08 +0200 |
| commit | 0c2b96fea853ce7f16a9326c3c98117d75defdf6 (patch) | |
| tree | ff3d108a1d7f295af840137e3c7f77e9d25692aa /src/basic/process-util.c | |
| parent | 6895c0be1845203e14b776dd8a15a97780ac6942 (diff) | |
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/basic/process-util.c')
| -rw-r--r-- | src/basic/process-util.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/basic/process-util.c b/src/basic/process-util.c index 81c4077c8..b90272e97 100644 --- a/src/basic/process-util.c +++ b/src/basic/process-util.c @@ -626,8 +626,7 @@ int get_process_environ(pid_t pid, char **env) { } else outcome[sz] = '\0'; - *env = outcome; - outcome = NULL; + *env = TAKE_PTR(outcome); return 0; } @@ -1479,7 +1478,7 @@ static const char *const ioprio_class_table[] = { [IOPRIO_CLASS_IDLE] = "idle" }; -DEFINE_STRING_TABLE_LOOKUP_WITH_FALLBACK(ioprio_class, int, INT_MAX); +DEFINE_STRING_TABLE_LOOKUP_WITH_FALLBACK(ioprio_class, int, IOPRIO_N_CLASSES); static const char *const sigchld_code_table[] = { [CLD_EXITED] = "exited", |