summaryrefslogtreecommitdiffstats
path: root/libdaemon
diff options
context:
space:
mode:
authorZdenek Kabelac <zkabelac@redhat.com>2012-03-01 21:12:37 +0000
committerZdenek Kabelac <zkabelac@redhat.com>2012-03-01 21:12:37 +0000
commitc45230754324ab46db86ee21036524ae0cb536e6 (patch)
treef0792343028bf76b54ebce5a5f43063cc00bd553 /libdaemon
parentbea2f619358d6aff06ad46be5913a3ac0a0d1fb8 (diff)
downloadlvm2-c45230754324ab46db86ee21036524ae0cb536e6.tar.gz
lvm2-c45230754324ab46db86ee21036524ae0cb536e6.tar.xz
lvm2-c45230754324ab46db86ee21036524ae0cb536e6.zip
Few more close and dev_close trace
Adding (void) where we cannot really report an error.
Diffstat (limited to 'libdaemon')
-rw-r--r--libdaemon/client/daemon-client.c3
-rw-r--r--libdaemon/server/daemon-server.c5
2 files changed, 5 insertions, 3 deletions
diff --git a/libdaemon/client/daemon-client.c b/libdaemon/client/daemon-client.c
index 3b336a32..28c44e82 100644
--- a/libdaemon/client/daemon-client.c
+++ b/libdaemon/client/daemon-client.c
@@ -57,7 +57,8 @@ daemon_handle daemon_open(daemon_info i) {
error:
h.error = errno;
if (h.socket_fd >= 0)
- close(h.socket_fd);
+ if (close(h.socket_fd))
+ perror("close");
if (r.cft)
daemon_reply_destroy(r);
h.socket_fd = -1;
diff --git a/libdaemon/server/daemon-server.c b/libdaemon/server/daemon-server.c
index 2188afe9..c93cde9f 100644
--- a/libdaemon/server/daemon-server.c
+++ b/libdaemon/server/daemon-server.c
@@ -306,7 +306,7 @@ static void _daemonise(void)
if (_systemd_activation && fd == SD_FD_SOCKET_SERVER)
continue;
#endif
- close(fd);
+ (void) close(fd);
}
if ((open("/dev/null", O_RDONLY) < 0) ||
@@ -407,7 +407,8 @@ static void *client_thread(void *baton)
}
fail:
/* TODO what should we really do here? */
- close(b->client.socket_fd);
+ if (close(b->client.socket_fd))
+ perror("close");
free(baton);
return NULL;
}