diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2020-09-16 15:36:44 +0200 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2020-09-18 15:28:48 +0200 |
| commit | 0706c012598eee8372fb5d4ca6688ac5fb2380a4 (patch) | |
| tree | c7764980023b427bcabbafa4813ae272681ffdb9 /src/basic/fd-util.c | |
| parent | 831d57953e8e688128bc0f871d4b4213459842ba (diff) | |
| download | systemd-0706c012598eee8372fb5d4ca6688ac5fb2380a4.tar.gz | |
Add CLOSE_AND_REPLACE helper
Similar to free_and_replace. I think this should be uppercase to make it
clear that this is a macro. free_and_replace should probably be uppercased
too.
Diffstat (limited to 'src/basic/fd-util.c')
| -rw-r--r-- | src/basic/fd-util.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/basic/fd-util.c b/src/basic/fd-util.c index 14b12b2706..3b2f93a073 100644 --- a/src/basic/fd-util.c +++ b/src/basic/fd-util.c @@ -731,8 +731,7 @@ int fd_duplicate_data_fd(int fd) { if (f != 0) return -errno; - safe_close(copy_fd); - copy_fd = TAKE_FD(tmp_fd); + CLOSE_AND_REPLACE(copy_fd, tmp_fd); remains = mfree(remains); remains_size = 0; @@ -865,8 +864,7 @@ int rearrange_stdio(int original_input_fd, int original_output_fd, int original_ goto finish; } - safe_close(null_fd); - null_fd = copy; + CLOSE_AND_REPLACE(null_fd, copy); } } |