From: Ivan Maidanski <ivmai@mail.ru>
Date: Tue, 10 Jul 2018 21:15:49 +0000 (+0300)
Subject: Eliminate 'scope of var can be reduced' cppcheck warning in pthread_join
X-Git-Tag: v7.6.8~33
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=76dcd13dd225ea144268abf8acbb1d1c1be26581;p=gc

Eliminate 'scope of var can be reduced' cppcheck warning in pthread_join

* win32_threads.c [GC_PTHREADS && GC_WIN32_PTHREADS] (GC_pthread_join):
Declare t local variable in the block where the variable is used.
---

diff --git a/win32_threads.c b/win32_threads.c
index a9cff3fc..3d2fe13f 100644
--- a/win32_threads.c
+++ b/win32_threads.c
@@ -2531,7 +2531,9 @@ GC_INNER void GC_thr_init(void)
   GC_API int GC_pthread_join(pthread_t pthread_id, void **retval)
   {
     int result;
-    GC_thread t;
+#   ifndef GC_WIN32_PTHREADS
+      GC_thread t;
+#   endif
     DCL_LOCK_STATE;
 
     GC_ASSERT(!GC_win32_dll_threads);
@@ -2554,7 +2556,7 @@ GC_INNER void GC_thr_init(void)
     if (0 == result) {
 #     ifdef GC_WIN32_PTHREADS
         /* pthreads-win32 and winpthreads id are unique (not recycled). */
-        t = GC_lookup_pthread(pthread_id);
+        GC_thread t = GC_lookup_pthread(pthread_id);
         if (NULL == t) ABORT("Thread not registered");
 #     endif