From c45230754324ab46db86ee21036524ae0cb536e6 Mon Sep 17 00:00:00 2001 From: Zdenek Kabelac Date: Thu, 1 Mar 2012 21:12:37 +0000 Subject: Few more close and dev_close trace Adding (void) where we cannot really report an error. --- daemons/clvmd/clvmd.c | 16 +++++++++------- daemons/dmeventd/dmeventd.c | 2 +- 2 files changed, 10 insertions(+), 8 deletions(-) (limited to 'daemons') diff --git a/daemons/clvmd/clvmd.c b/daemons/clvmd/clvmd.c index 2ee56108..f6ce3fdc 100644 --- a/daemons/clvmd/clvmd.c +++ b/daemons/clvmd/clvmd.c @@ -1052,11 +1052,11 @@ static void be_daemon(int timeout) exit(2); case 0: /* Child */ - close(child_pipe[0]); + (void) close(child_pipe[0]); break; default: /* Parent */ - close(child_pipe[1]); + (void) close(child_pipe[1]); wait_for_child(child_pipe[0], timeout); } @@ -1140,8 +1140,8 @@ static int read_from_local_sock(struct local_client *thisfd) struct local_client *lastfd = NULL; struct local_client *free_fd = NULL; - close(thisfd->bits.localsock.pipe_client->fd); /* Close pipe */ - close(thisfd->bits.localsock.pipe); + (void) close(thisfd->bits.localsock.pipe_client->fd); /* Close pipe */ + (void) close(thisfd->bits.localsock.pipe); /* Remove pipe client */ for (newfd = &local_client_head; newfd != NULL; @@ -1329,8 +1329,8 @@ static int read_from_local_sock(struct local_client *thisfd) .status = ENOMEM }; - close(comms_pipe[0]); - close(comms_pipe[1]); + (void) close(comms_pipe[0]); + (void) close(comms_pipe[1]); send_message(&reply, sizeof(reply), our_csid, thisfd->fd, @@ -2107,7 +2107,9 @@ static int check_local_clvmd(void) ret = -1; } - close(local_socket); + if (close(local_socket)) + log_sys_error("close", "local socket"); + return ret; } diff --git a/daemons/dmeventd/dmeventd.c b/daemons/dmeventd/dmeventd.c index 5c232644..bfd5d36e 100644 --- a/daemons/dmeventd/dmeventd.c +++ b/daemons/dmeventd/dmeventd.c @@ -1803,7 +1803,7 @@ static void _daemonize(void) (fd == SD_FD_FIFO_SERVER || fd == SD_FD_FIFO_CLIENT)) continue; #endif - close(fd); + (void) close(fd); } if ((open("/dev/null", O_RDONLY) < 0) || -- cgit