diff options
author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2022-12-19 13:07:42 +0100 |
---|---|---|
committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2022-12-19 15:00:57 +0100 |
commit | 254d1313ae5a69c08c9b93032aaaf3d6083cfc07 (patch) | |
tree | 067102a36abe6bf597c26a42d79018a1060c9007 /src/shared/copy.c | |
parent | sd-event: never pass negative errnos as signalfd to signalfd (diff) | |
download | systemd-254d1313ae5a69c08c9b93032aaaf3d6083cfc07.tar.xz systemd-254d1313ae5a69c08c9b93032aaaf3d6083cfc07.zip |
tree-wide: use -EBADF for fd initialization
-1 was used everywhere, but -EBADF or -EBADFD started being used in various
places. Let's make things consistent in the new style.
Note that there are two candidates:
EBADF 9 Bad file descriptor
EBADFD 77 File descriptor in bad state
Since we're initializating the fd, we're just assigning a value that means
"no fd yet", so it's just a bad file descriptor, and the first errno fits
better. If instead we had a valid file descriptor that became invalid because
of some operation or state change, the other errno would fit better.
In some places, initialization is dropped if unnecessary.
Diffstat (limited to 'src/shared/copy.c')
-rw-r--r-- | src/shared/copy.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/shared/copy.c b/src/shared/copy.c index e2ce4b2907..e103aa0f7f 100644 --- a/src/shared/copy.c +++ b/src/shared/copy.c @@ -713,7 +713,7 @@ static int fd_copy_regular( copy_progress_bytes_t progress, void *userdata) { - _cleanup_close_ int fdf = -1, fdt = -1; + _cleanup_close_ int fdf = -EBADF, fdt = -EBADF; int r, q; assert(from); @@ -904,11 +904,11 @@ static int fd_copy_directory( void *userdata) { _cleanup_(hardlink_context_destroy) HardlinkContext our_hardlink_context = { - .dir_fd = -1, - .parent_fd = -1, + .dir_fd = -EBADF, + .parent_fd = -EBADF, }; - _cleanup_close_ int fdf = -1, fdt = -1; + _cleanup_close_ int fdf = -EBADF, fdt = -EBADF; _cleanup_closedir_ DIR *d = NULL; bool exists, created; int r; @@ -1286,7 +1286,7 @@ int copy_file_fd_full( copy_progress_bytes_t progress_bytes, void *userdata) { - _cleanup_close_ int fdf = -1; + _cleanup_close_ int fdf = -EBADF; struct stat st; int r; @@ -1339,7 +1339,7 @@ int copy_file_full( copy_progress_bytes_t progress_bytes, void *userdata) { - _cleanup_close_ int fdf = -1, fdt = -1; + _cleanup_close_ int fdf = -EBADF, fdt = -EBADF; struct stat st; int r; @@ -1428,7 +1428,7 @@ int copy_file_atomic_full( void *userdata) { _cleanup_(unlink_and_freep) char *t = NULL; - _cleanup_close_ int fdt = -1; + _cleanup_close_ int fdt = -EBADF; int r; assert(from); |