From 36082bee6cdb1a2b2751f027cb7ce3c40b06a14a Mon Sep 17 00:00:00 2001 From: Ivan Maidanski Date: Wed, 11 Jul 2018 00:15:49 +0300 Subject: [PATCH] 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. --- win32_threads.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/win32_threads.c b/win32_threads.c index 6434497..a16aa9e 100644 --- a/win32_threads.c +++ b/win32_threads.c @@ -2546,7 +2546,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); @@ -2569,7 +2571,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 -- 2.7.4