[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[Libguestfs] [PATCH 1/3] daemon: pwrite/pread: Don't double close on error path.



From: "Richard W.M. Jones" <rjones redhat com>

In Linux, close (fd) closes the file descriptor even if it returns an
error.
---
 daemon/file.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/daemon/file.c b/daemon/file.c
index e0f8794..91746e0 100644
--- a/daemon/file.c
+++ b/daemon/file.c
@@ -483,7 +483,6 @@ pread_fd (int fd, int count, int64_t offset, size_t *size_r,
 
   if (close (fd) == -1) {
     reply_with_perror ("close: %s", display_path);
-    close (fd);
     free (buf);
     return NULL;
   }
@@ -539,7 +538,6 @@ pwrite_fd (int fd, const char *content, size_t size, int64_t offset,
 
   if (close (fd) == -1) {
     reply_with_perror ("close: %s", display_path);
-    close (fd);
     return -1;
   }
 
-- 
1.7.6


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]