]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
shared/sleep-config: fix error handling for open
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Fri, 25 Oct 2019 15:02:58 +0000 (17:02 +0200)
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Fri, 25 Oct 2019 15:03:02 +0000 (17:03 +0200)
CID#1406472.

src/shared/sleep-config.c

index b5bc6595bd6e557d087e006d9647bb7ff32290e3..3ead397979b1e167011a68e013bb79c2941e78cf 100644 (file)
@@ -226,11 +226,10 @@ static int calculate_swap_file_offset(const SwapEntry *swap, uint64_t *ret_offse
         assert(streq(swap->type, "file"));
 
         fd = open(swap->device, O_RDONLY|O_CLOEXEC|O_NOCTTY);
-        if (!fd)
+        if (fd < 0)
                 return log_error_errno(errno, "Failed to open %s: %m", swap->device);
 
-        r = fstat(fd, &sb);
-        if (r < 0)
+        if (fstat(fd, &sb) < 0)
                 return log_error_errno(errno, "Failed to stat %s: %m", swap->device);
 
         btrfs = btrfs_is_filesystem(fd);