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:
@@ -278,8 +278,7 @@ int locale_write_data(Context *c, char ***settings) {
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
||||
*settings = l;
|
||||
l = NULL;
|
||||
*settings = TAKE_PTR(l);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -539,8 +538,7 @@ int find_converted_keymap(const char *x11_layout, const char *x11_variant, char
|
||||
log_debug("Found converted keymap %s at %s",
|
||||
n, uncompressed ? p : pz);
|
||||
|
||||
*new_keymap = n;
|
||||
n = NULL;
|
||||
*new_keymap = TAKE_PTR(n);
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user