diff options
| author | Rob Landley <rob@landley.net> | 2021-02-08 03:08:26 -0600 |
|---|---|---|
| committer | Rob Landley <rob@landley.net> | 2021-02-08 03:08:26 -0600 |
| commit | a079039934311f64a48e1010a97492a22126042e (patch) | |
| tree | df156add0a45e445c57dd70354cd7e2f85ff697f /toys/other | |
| parent | bdb0e5fd6e031f9b3fae95d8180cf6bba32384c8 (diff) | |
| download | toybox-a079039934311f64a48e1010a97492a22126042e.tar.gz | |
Have xclose() perform the fd != -1 test.
Diffstat (limited to 'toys/other')
| -rw-r--r-- | toys/other/hwclock.c | 2 | ||||
| -rw-r--r-- | toys/other/losetup.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/toys/other/hwclock.c b/toys/other/hwclock.c index a6db923a..541c70a3 100644 --- a/toys/other/hwclock.c +++ b/toys/other/hwclock.c @@ -84,5 +84,5 @@ void hwclock_main() if (settimeofday(&timeval, &tzone)) perror_exit("settimeofday failed"); } - if (fd != -1) close(fd); + xclose(fd); } diff --git a/toys/other/losetup.c b/toys/other/losetup.c index 27d25a18..7b8aed4f 100644 --- a/toys/other/losetup.c +++ b/toys/other/losetup.c @@ -52,7 +52,7 @@ GLOBALS( static int loopback_setup(char *device, char *file) { struct loop_info64 *loop = (void *)(toybuf+32); - int lfd = -1, ffd = ffd; + int lfd = -1, ffd = -1; int racy = !device; // Open file (ffd) and loop device (lfd) @@ -129,8 +129,8 @@ static int loopback_setup(char *device, char *file) } done: - if (file) close(ffd); - if (lfd != -1) close(lfd); + xclose(ffd); + xclose(lfd); return 0; } |