From 111e540eb4ee2be2500e81bc14087042afb79b82 Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Wed, 18 Nov 2009 21:46:35 -0700 Subject: [PATCH] build: avoid compiler warnings Silence some warnings found on mingw. * lib/select.c (rpl_select): Delete unused variable. * lib/setsockopt.c (rpl_setsockopt): Avoid incompatible pointer. Signed-off-by: Eric Blake --- ChangeLog | 6 ++++++ lib/select.c | 2 -- lib/setsockopt.c | 3 ++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index a868d1daa..1e236e64f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2009-11-19 Eric Blake + + build: avoid compiler warnings + * lib/select.c (rpl_select): Delete unused variable. + * lib/setsockopt.c (rpl_setsockopt): Avoid incompatible pointer. + 2009-11-18 Eric Blake tests: avoid false negative with --with-packager diff --git a/lib/select.c b/lib/select.c index 12d3e519c..e82bf889f 100644 --- a/lib/select.c +++ b/lib/select.c @@ -322,8 +322,6 @@ rpl_select (int nfds, fd_set *rfds, fd_set *wfds, fd_set *xfds, /* Classify handles. Create fd sets for sockets, poll the others. */ for (i = 0; i < nfds; i++) { - WSANETWORKEVENTS ev; - if ((anyfds_in[i / CHAR_BIT] & (1 << (i & (CHAR_BIT - 1)))) == 0) continue; diff --git a/lib/setsockopt.c b/lib/setsockopt.c index 96a00cc2e..daff382a8 100644 --- a/lib/setsockopt.c +++ b/lib/setsockopt.c @@ -41,7 +41,8 @@ rpl_setsockopt (int fd, int level, int optname, const void *optval, socklen_t op { const struct timeval *tv = optval; int milliseconds = tv->tv_sec * 1000 + tv->tv_usec / 1000; - r = setsockopt (sock, level, optname, &milliseconds, sizeof (int)); + optval = &milliseconds; + r = setsockopt (sock, level, optname, optval, sizeof (int)); } else { -- 2.11.0