testdir40: try 3.

Author: bhaible

testdir40/gllib/pthread_mutex_timedlock.c

@@ -40,7 +40,7 @@ pthread_mutex_timedlock (pthread_mutex_t *mutex, const struct timespec *abstime)
      Therefore start the loop with a pthread_mutex_trylock call.  */
   for (;;)
     {
-      err = pthread_mutex_trylock (mutex);
+      int err = pthread_mutex_trylock (mutex);
       if (err != EBUSY)
         return err;
 

testdir40/gllib/renameatu.c

@@ -145,13 +145,15 @@ renameatu (int fd1, char const *src, int fd2, char const *dst,
          is defined, because RENAME_EXCL is buggy on macOS 11.2:
          renameatx_np (fd, "X", fd, "X", RENAME_EXCL) incorrectly
          succeeds when X exists.  */
-      struct stat dst_st;
-      if (fstatat (fd2, dst, &dst_st, AT_SYMLINK_NOFOLLOW) == 0
-          || errno == EOVERFLOW)
-        return errno_fail (EEXIST);
-      if (errno != ENOENT)
-        return -1;
-      dst_found_nonexistent = true;
+      {
+        struct stat dst_st;
+        if (fstatat (fd2, dst, &dst_st, AT_SYMLINK_NOFOLLOW) == 0
+            || errno == EOVERFLOW)
+          return errno_fail (EEXIST);
+        if (errno != ENOENT)
+          return -1;
+        dst_found_nonexistent = true;
+      }
       break;
 
     case RENAME_EXCHANGE:

testdir40/gllib/select.c

@@ -307,7 +307,7 @@ rpl_select (int nfds, fd_set *rfds, fd_set *wfds, fd_set *xfds,
     for (int i = 0; i < rfds->fd_count; i++)
       {
         int fd = rfds->fd_array[i];
-        h = (HANDLE) _get_osfhandle (fd);
+        HANDLE h = (HANDLE) _get_osfhandle (fd);
         DWORD nbuffer;
         if (!IsConsoleHandle (h)
             || GetNumberOfConsoleInputEvents (h, &nbuffer))
@@ -323,7 +323,7 @@ rpl_select (int nfds, fd_set *rfds, fd_set *wfds, fd_set *xfds,
     for (int i = 0; i < wfds->fd_count; i++)
       {
         int fd = wfds->fd_array[i];
-        h = (HANDLE) _get_osfhandle (fd);
+        HANDLE h = (HANDLE) _get_osfhandle (fd);
         DWORD nbuffer;
         if (!IsConsoleHandle (h)
             || !GetNumberOfConsoleInputEvents (h, &nbuffer))