From: Eric Blake <ebb9@byu.net>
Date: Thu, 19 Nov 2009 04:46:35 +0000 (-0700)
Subject: build: avoid compiler warnings
X-Git-Tag: stable/20091120~5
X-Git-Url: https://erislabs.net/gitweb/?a=commitdiff_plain;h=0028f2774ffdde94d49854e5ec881ba9b6e8d817;p=gnulib.git

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 <ebb9@byu.net>
(cherry picked from commit 111e540eb4ee2be2500e81bc14087042afb79b82)
---

diff --git a/ChangeLog b/ChangeLog
index 1e8778d47..85e28ff04 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-11-19  Eric Blake  <ebb9@byu.net>
+
+	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  <ebb9@byu.net>
 
 	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
     {