summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvan Maidanski <ivmai@mail.ru>2018-07-11 00:22:20 +0300
committerIvan Maidanski <ivmai@mail.ru>2018-07-11 11:52:45 +0300
commit0ea46164887d647eefac6b15f178880f1cd17314 (patch)
tree01797ef9b027e4db0fd1d9dd41f7c0fdfb1c18ea
parent76dcd13dd225ea144268abf8acbb1d1c1be26581 (diff)
downloadbdwgc-0ea46164887d647eefac6b15f178880f1cd17314.tar.gz
Eliminate 'condition is always true' cppcheck warning in init_gcj_malloc
* gcj_mlc.c (GC_init_gcj_malloc): Define ignore_gcj_info as macro if GC_IGNORE_GCJ_INFO; undefine ignore_gcj_info at the end of the function.
-rw-r--r--gcj_mlc.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/gcj_mlc.c b/gcj_mlc.c
index 8879a3bb..b37d0b35 100644
--- a/gcj_mlc.c
+++ b/gcj_mlc.c
@@ -67,7 +67,9 @@ STATIC struct GC_ms_entry * GC_gcj_fake_mark_proc(word * addr GC_ATTR_UNUSED,
GC_API void GC_CALL GC_init_gcj_malloc(int mp_index,
void * /* really GC_mark_proc */mp)
{
- GC_bool ignore_gcj_info;
+# ifndef GC_IGNORE_GCJ_INFO
+ GC_bool ignore_gcj_info;
+# endif
DCL_LOCK_STATE;
if (mp == 0) /* In case GC_DS_PROC is unused. */
@@ -82,7 +84,7 @@ GC_API void GC_CALL GC_init_gcj_malloc(int mp_index,
GC_gcj_malloc_initialized = TRUE;
# ifdef GC_IGNORE_GCJ_INFO
/* This is useful for debugging on platforms with missing getenv(). */
- ignore_gcj_info = 1;
+# define ignore_gcj_info TRUE
# else
ignore_gcj_info = (0 != GETENV("GC_IGNORE_GCJ_INFO"));
# endif
@@ -119,6 +121,7 @@ GC_API void GC_CALL GC_init_gcj_malloc(int mp_index,
FALSE, TRUE);
}
UNLOCK();
+# undef ignore_gcj_info
}
#define GENERAL_MALLOC_INNER(lb,k) \