w32: Fix Windows specific warnings.

* src/assuan-socket-connect.c (_assuan_connect_finalize): We don't use
FLAGS.
* src/assuan-socket.c (_assuan_sock_get_flag): It's unsigned on
Windows.
(_assuan_sock_get_nonce): We don't use ADDRLEN.
* src/system-w32.c (__assuan_spawn): We don't use ATFORK and
ATFORKVALUE.
* src/system.c (_assuan_socket): We care about ASSUAN_INVALID_FD.

--

Signed-off-by: NIIBE Yutaka <[email protected]>

4 files changed, 20 insertions, 1 deletions

diff --git a/src/assuan-socket-connect.c b/src/assuan-socket-connect.c
index a6ff495..e22272f 100644
--- a/src/assuan-socket-connect.c
+++ b/src/assuan-socket-connect.c
@@ -115,6 +115,7 @@ _assuan_connect_finalize (assuan_context_t ctx, assuan_fd_t fd,
   ctx->max_accepts = -1;
 
 #ifdef HAVE_W32_SYSTEM
+  (void)flags;
   ctx->engine.sendfd = w32_fdpass_send;
 #else
   if (flags & ASSUAN_SOCKET_CONNECT_FDPASSING)
diff --git a/src/assuan-socket.c b/src/assuan-socket.c
index b1d778e..77b7dae 100644
--- a/src/assuan-socket.c
+++ b/src/assuan-socket.c
@@ -662,7 +662,11 @@ _assuan_sock_get_flag (assuan_context_t ctx, assuan_fd_t sockfd,
           gpg_err_set_errno (EINVAL);
           return -1;
         }
-      if (li.l_onoff && li.l_linger >= 0)
+      if (li.l_onoff
+#if !defined(HAVE_W32_SYSTEM)
+          && li.l_linger >= 0
+#endif
+          )
         *r_value = li.l_linger;
       else
         *r_value = -1;
@@ -1445,6 +1449,7 @@ _assuan_sock_get_nonce (assuan_context_t ctx, struct sockaddr *addr,
 {
   (void)ctx;
 #ifdef HAVE_W32_SYSTEM
+  (void)addrlen;
   if (addr->sa_family == AF_LOCAL || addr->sa_family == AF_UNIX)
     {
       struct sockaddr_un *unaddr;
diff --git a/src/system-w32.c b/src/system-w32.c
index 6c4967b..5fbcf21 100644
--- a/src/system-w32.c
+++ b/src/system-w32.c
@@ -497,6 +497,8 @@ __assuan_spawn (assuan_context_t ctx, assuan_pid_t *r_pid, const char *name,
      value, change it, create process and restore it, is not thread
      safe.  */
 
+  (void)atfork;
+  (void)atforkvalue;
   /* Build the command line.  */
   if (build_w32_commandline (ctx, argv, &cmdline))
     return -1;
diff --git a/src/system.c b/src/system.c
index a148a59..d01fce9 100644
--- a/src/system.c
+++ b/src/system.c
@@ -517,7 +517,18 @@ _assuan_socket (assuan_context_t ctx, int namespace, int style, int protocol)
     res = (ctx->system.socket) (ctx, namespace, style, protocol);
   else
     res = __assuan_socket (ctx, namespace, style, protocol);
+#if defined(HAVE_W32_SYSTEM)
+  if (res == ASSUAN_INVALID_FD)
+    _assuan_debug (_assuan_trace_context, _assuan_trace_level,
+                   "%s (%s=%p): error: %s\n",
+                   _assuan_trace_func, _assuan_trace_tagname,
+		   _assuan_trace_tag, strerror (errno));
+  else
+    (void)(TRACE_SUC1 ("result=%i", res));
+  return res;
+#else
   return TRACE_SYSRES (res);
+#endif
 }