From 33dc2ded8886f35b261c4ef3d344eca3d9fe112d Mon Sep 17 00:00:00 2001 From: Ivan Maidanski Date: Wed, 18 Jan 2012 08:36:33 +0400 Subject: Use EXPECT in malloc result testing for NULL * gcj_mlc.c (GC_gcj_malloc_ignore_off_page): Use EXPECT to test "op" value for NULL. * malloc.c (GC_generic_malloc_inner, GC_malloc_uncollectable): Likewise. * mallocx.c (GC_generic_malloc_many, GC_posix_memalign): Likewise. * typd_mlc.c (GC_malloc_explicitly_typed, GC_malloc_explicitly_typed_ignore_off_page, GC_calloc_explicitly_typed): Likewise. --- gcj_mlc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gcj_mlc.c') diff --git a/gcj_mlc.c b/gcj_mlc.c index a7fefd9d..a5f3fe50 100644 --- a/gcj_mlc.c +++ b/gcj_mlc.c @@ -247,7 +247,8 @@ GC_API void * GC_CALL GC_gcj_malloc_ignore_off_page(size_t lb, lg = GC_size_map[lb]; opp = &(GC_gcjobjfreelist[lg]); LOCK(); - if( (op = *opp) == 0 ) { + op = *opp; + if (EXPECT(0 == op, FALSE)) { maybe_finalize(); op = (ptr_t)GENERAL_MALLOC_INNER_IOP(lb, GC_gcj_kind); if (0 == op) { -- cgit v1.2.1