summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Schwenke <martin@meltin.net>2011-11-10 10:46:10 +1100
committerStefan Metzmacher <metze@samba.org>2011-11-10 10:28:44 +0100
commit538748132fbf6bcc1ce0bbd474e4abf3ecdabffa (patch)
treee8c2f42d36bdbed2431a5a67d98e9e0a56f6ba62
parent7d84805ac06522dabeb4f8d5b69dab2918a508ba (diff)
downloadsamba-538748132fbf6bcc1ce0bbd474e4abf3ecdabffa.tar.gz
samba-538748132fbf6bcc1ce0bbd474e4abf3ecdabffa.tar.bz2
samba-538748132fbf6bcc1ce0bbd474e4abf3ecdabffa.zip
Fix -Wunused-but-set-variable compiler warnings in tevent_signal.c
The results of some read(2) and write(2) calls are assigned into a variable that is never used. Presumably this used to avoid compiler warnings or similar. However, from (approximately) GCC 4.6 this produces some warnings: [ 609/3910] Compiling lib/tevent/tevent_signal.c ../lib/tevent/tevent_signal.c: In function ‘tevent_common_signal_handler’: ../lib/tevent/tevent_signal.c:85:10: warning: variable ‘res’ set but not used [-Wunused-but-set-variable] ../lib/tevent/tevent_signal.c: In function ‘signal_pipe_handler’: ../lib/tevent/tevent_signal.c:183:10: warning: variable ‘res’ set but not used [-Wunused-but-set-variable] The simplest thing to do is remove the variables and cast the function return to void. There is already a comment above each call. Signed-off-by: Martin Schwenke <martin@meltin.net> Signed-off-by: Stefan Metzmacher <metze@samba.org>
-rw-r--r--lib/tevent/tevent_signal.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/tevent/tevent_signal.c b/lib/tevent/tevent_signal.c
index b7908593f0..fabe72cdc8 100644
--- a/lib/tevent/tevent_signal.c
+++ b/lib/tevent/tevent_signal.c
@@ -82,7 +82,6 @@ static uint32_t tevent_sig_count(struct tevent_sigcounter s)
static void tevent_common_signal_handler(int signum)
{
char c = 0;
- ssize_t res;
struct tevent_common_signal_list *sl;
struct tevent_context *ev = NULL;
int saved_errno = errno;
@@ -95,7 +94,7 @@ static void tevent_common_signal_handler(int signum)
if (sl->se->event_ctx && sl->se->event_ctx != ev) {
ev = sl->se->event_ctx;
/* doesn't matter if this pipe overflows */
- res = write(ev->pipe_fds[1], &c, 1);
+ (void) write(ev->pipe_fds[1], &c, 1);
}
}
@@ -180,9 +179,8 @@ static void signal_pipe_handler(struct tevent_context *ev, struct tevent_fd *fde
uint16_t flags, void *_private)
{
char c[16];
- ssize_t res;
/* its non-blocking, doesn't matter if we read too much */
- res = read(fde->fd, c, sizeof(c));
+ (void) read(fde->fd, c, sizeof(c));
}
/*