New upstream version 1.4.2upstream/1.4.2upstream

1 files changed, 7 insertions, 14 deletions

diff --git a/tests/sockets.c b/tests/sockets.c
index 7accfdd3..ce98698d 100644
--- a/tests/sockets.c
+++ b/tests/sockets.c
@@ -1,6 +1,6 @@
 /* sockets.c --- wrappers for Windows socket functions
 
-   Copyright (C) 2008-2025 Free Software Foundation, Inc.
+   Copyright (C) 2008-2026 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
@@ -46,11 +46,10 @@ close_fd_maybe_socket (const struct fd_hook *remaining_list,
      our calls to closesocket() and the primary close(), some other thread
      could make system calls that allocate precisely the same HANDLE value
      as sock; then the primary close() would call CloseHandle() on it.  */
-  SOCKET sock;
-  WSANETWORKEVENTS ev;
 
   /* Test whether fd refers to a socket.  */
-  sock = FD_TO_SOCKET (fd);
+  SOCKET sock = FD_TO_SOCKET (fd);
+  WSANETWORKEVENTS ev;
   ev.lNetworkEvents = 0xDEADBEEF;
   WSAEnumNetworkEvents (sock, NULL, &ev);
   if (ev.lNetworkEvents != 0xDEADBEEF)
@@ -83,11 +82,9 @@ ioctl_fd_maybe_socket (const struct fd_hook *remaining_list,
                        gl_ioctl_fn primary,
                        int fd, int request, void *arg)
 {
-  SOCKET sock;
-  WSANETWORKEVENTS ev;
-
   /* Test whether fd refers to a socket.  */
-  sock = FD_TO_SOCKET (fd);
+  SOCKET sock = FD_TO_SOCKET (fd);
+  WSANETWORKEVENTS ev;
   ev.lNetworkEvents = 0xDEADBEEF;
   WSAEnumNetworkEvents (sock, NULL, &ev);
   if (ev.lNetworkEvents != 0xDEADBEEF)
@@ -119,9 +116,7 @@ gl_sockets_startup (_GL_UNUSED int version)
   if (version > initialized_sockets_version)
     {
       WSADATA data;
-      int err;
-
-      err = WSAStartup (version, &data);
+      int err = WSAStartup (version, &data);
       if (err != 0)
         return 1;
 
@@ -146,13 +141,11 @@ int
 gl_sockets_cleanup (void)
 {
 #if WINDOWS_SOCKETS
-  int err;
-
   initialized_sockets_version = 0;
 
   unregister_fd_hook (&fd_sockets_hook);
 
-  err = WSACleanup ();
+  int err = WSACleanup ();
   if (err != 0)
     return 1;
 #endif