summaryrefslogtreecommitdiff
path: root/malloc.c
diff options
context:
space:
mode:
authorIvan Maidanski <ivmai@mail.ru>2023-04-12 21:25:29 +0300
committerIvan Maidanski <ivmai@mail.ru>2023-04-12 21:25:29 +0300
commit2f59089f738b9eed6bcb98da5d507ebb4b2c3075 (patch)
tree1bb9aa76123926911e1570d419bc30a858a44b55 /malloc.c
parent274e5ced83975df4df880b7d6c32061fa1c67985 (diff)
downloadbdwgc-2f59089f738b9eed6bcb98da5d507ebb4b2c3075.tar.gz
Fix 'scope of lg can be reduced' cppcheck warning in generic_malloc_aligned
(fix of commit 274e5ced8) * malloc.c [!THREADS] (GC_generic_malloc_aligned): Define lg local variable inside inner block (for use only by GRANULES_TO_BYTES).
Diffstat (limited to 'malloc.c')
-rw-r--r--malloc.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/malloc.c b/malloc.c
index 8c73f113..d921daeb 100644
--- a/malloc.c
+++ b/malloc.c
@@ -236,7 +236,9 @@ GC_INNER void * GC_generic_malloc_aligned(size_t lb, int k, unsigned flags,
result = GC_generic_malloc_inner_small(lb, k);
UNLOCK();
} else {
- size_t lg;
+# ifdef THREADS
+ size_t lg;
+# endif
size_t lb_rounded;
GC_bool init;
@@ -250,6 +252,10 @@ GC_INNER void * GC_generic_malloc_aligned(size_t lb, int k, unsigned flags,
} else
# endif
/* else */ {
+# ifndef THREADS
+ size_t lg; /* CPPCHECK */
+# endif
+
if (EXPECT(0 == lb, FALSE)) lb = 1;
lg = ALLOC_REQUEST_GRANS(lb);
lb_rounded = GRANULES_TO_BYTES(lg);