Eliminate 'scope of variable can be reduced' cppcheck warnings

* src/atomic_ops_malloc.c (msb): Declare "v" variable exactly in the
scope where the variable is used in.
* tests/run_parallel.h [USE_PTHREADS || USE_WINTHREADS] (run_parallel):
Declare "code" variable exactly in the scope where the variable is
used in.

diff --git a/src/atomic_ops_malloc.c b/src/atomic_ops_malloc.c
index 3753016eecfde39cde6fe749bc0c890053f78f3a..7178f498be125d18bfdbbad1072358e70704fe66 100644 (file)
--- a/src/atomic_ops_malloc.c
+++ b/src/atomic_ops_malloc.c
@@ -238,8 +238,8 @@ static const unsigned char msbs[16] = {
 static unsigned msb(size_t s)
 {
   unsigned result = 0;
-  unsigned v;
   if ((s & 0xff) != s) {
+    unsigned v;
     /* The following is a tricky code ought to be equivalent to         */
     /* "(v = s >> 32) != 0" but suppresses warnings on 32-bit arch's.   */
     if (sizeof(size_t) > 4 && (v = s >> (sizeof(size_t) > 4 ? 32 : 0)) != 0)

diff --git a/tests/run_parallel.h b/tests/run_parallel.h
index 42110dc1700f330ad0192787d1b59a21473dc647..d24b9e632dad18375daf3ec955afc871b060ab4a 100644 (file)
--- a/tests/run_parallel.h
+++ b/tests/run_parallel.h
@@ -57,7 +57,6 @@ void * run_parallel(int nthreads, thr_func f1, test_func t, const char *name)
   pthread_attr_t attr;
   pthread_t thr[100];
   int i;
-  int code;
 
   printf("Testing %s\n", name);
   if (nthreads > 100)
@@ -80,7 +79,8 @@ void * run_parallel(int nthreads, thr_func f1, test_func t, const char *name)
 
   for (i = 0; i < nthreads; ++i)
     {
-      if ((code = pthread_create(thr + i, &attr, f1, (void *)(long)i)) != 0)
+      int code = pthread_create(thr + i, &attr, f1, (void *)(long)i);
+      if (code != 0)
       {
         fprintf(stderr, "pthread_create returned %d, thread %d\n", code, i);
         abort();
@@ -88,7 +88,8 @@ void * run_parallel(int nthreads, thr_func f1, test_func t, const char *name)
     }
   for (i = 0; i < nthreads; ++i)
     {
-      if ((code = pthread_join(thr[i], NULL)) != 0)
+      int code = pthread_join(thr[i], NULL);
+      if (code != 0)
       {
         fprintf(stderr, "pthread_join returned %d, thread %d\n", code, i);
         abort();
@@ -168,7 +169,6 @@ void * run_parallel(int nthreads, thr_func f1, test_func t, const char *name)
   HANDLE thr[100];
   struct tramp_args args[100];
   int i;
-  DWORD code;
 
   printf("Testing %s\n", name);
   if (nthreads > 100)
@@ -191,7 +191,8 @@ void * run_parallel(int nthreads, thr_func f1, test_func t, const char *name)
     }
   for (i = 0; i < nthreads; ++i)
     {
-      if ((code = WaitForSingleObject(thr[i], INFINITE)) != WAIT_OBJECT_0)
+      DWORD code = WaitForSingleObject(thr[i], INFINITE);
+      if (code != WAIT_OBJECT_0)
       {
         fprintf(stderr, "WaitForSingleObject returned %lu, thread %d\n",
                 (unsigned long)code, i);