From d833880a0f3cab314cd1f06a1a1bec5024cfdacd Mon Sep 17 00:00:00 2001 From: Ivan Maidanski Date: Sat, 30 Apr 2022 19:00:14 +0300 Subject: Remove extra parentheses in return statement (refactoring) Also, replace 0 to NULL where appropriate. * allchblk.c (setup_header, GC_get_first_part, GC_allochblk_nth): Remove outermost parentheses in the expression of return statement. * alloc.c (GC_never_stop_func, GC_timeout_stop_func, GC_adj_bytes_allocd, GC_try_to_collect_inner, GC_collect_a_little, GC_stopped_mark, GC_try_to_collect_general, GC_expand_hp_inner, GC_collect_or_expand, GC_allocobj): Likewise. * blacklst.c (GC_is_black_listed, GC_number_stack_black_listed, total_stack_black_listed): Likewise. * checksums.c (GC_checksum): Likewise. * cord/cordbscs.c (CORD_cat_char_star, CORD_cat, CORD_len, CORD_index_access_fn, CORD_apply_access_fn, CORD_substr_checked, CORD_substr, CORD_iter5, CORD_iter, CORD_riter4, CORD_riter, CORD_concat_forest, CORD_balance, CORD__pos_fetch, CORD__prev, CORD_prev, CORD_pos_to_cord, CORD_pos_valid): Likewise. * cord/cordprnt.c (extract_conv_spec, CORD_vsprintf, CORD_sprintf, CORD_fprintf, CORD_vfprintf, CORD_printf, CORD_vprintf): Likewise. * cord/cordxtra.c (CORD_cat_char, CORD_catn, CORD_fill_proc, CORD_batched_fill_proc, CORD_cmp, CORD_ncmp, CORD_to_char_star, CORD_from_char_star, CORD_to_const_char_star, CORD_fetch, CORD_put_proc, CORD_batched_put_proc, CORD_put, CORD_chr_proc, CORD_rchr_proc, CORD_batched_chr_proc, CORD_chr, CORD_rchr, CORD_str, CORD_from_file_eager, CORD_lf_func, CORD_from_file_lazy_inner, CORD_from_file_lazy, CORD_from_file): Likewise. * cord/tests/cordtest.c (test_fn, id_cord_fn, test_basics): Likewise. * cord/tests/de.c (line_pos, add_hist, retrieve_line, beep): Likewise. * cord/tests/de_win.c (WinMain, plain_chars, control_chars, WndProc): Likewise. * dbg_mlc.c (store_debug_info, GC_debug_generic_malloc, GC_debug_generic_malloc, GC_debug_realloc, GC_make_closure): Likewise. * dyn_load.c (GC_FirstDLOpenedLinkMap): Likewise. * extra/real_malloc.c (real_malloc): Likewise. * finalize.c (GC_register_disappearing_link, GC_unregister_disappearing_link): Likewise. * gc_dlopen.c (dlopen): Likewise. * gcj_mlc.c (maybe_finalize, GC_debug_gcj_malloc, GC_gcj_malloc_ignore_off_page): Likewise. * headers.c (GC_find_header, alloc_hdr, get_index, GC_install_header, GC_next_block, GC_prev_block): Likewise. * malloc.c (GC_generic_malloc): Likewise. * mallocx.c (GC_realloc, GC_generic_malloc_ignore_off_page): Likewise. * mark.c (GC_collection_in_progress, GC_mark_some, GC_signal_mark_stack_overflow, GC_block_was_dirty, GC_push_next_marked, GC_push_next_marked_dirty, GC_push_next_marked_uncollectable): Likewise. * mark_rts.c (GC_is_static_root, rt_hash, GC_roots_present, GC_remove_tmp_roots, GC_approx_sp): Likewise. * misc.c (GC_default_oom_fn, GC_clear_stack_inner, GC_base, GC_write, GC_get_warn_proc, GC_call_with_alloc_lock): Likewise. * new_hblk.c (GC_build_fl_clear2, GC_build_fl_clear4, GC_build_fl2, GC_build_fl4, GC_build_fl): Likewise. * obj_map.c (GC_register_displacement_inner): Likewise. * os_dep.c (GC_find_limit_openbsd, GC_skip_hole_openbsd, GC_get_writable_length, GC_get_writable_length, GC_get_main_stack_base, GC_FreeBSDGetDataStart, GC_unix_mmap_get_mem, GC_unix_sbrk_get_mem, os2_alloc, GC_wince_get_mem, GC_win32_get_mem, GC_push_thread_stack, GC_push_old_obj, GC_write_fault_handler, catch_exception_raise_state, catch_exception_raise_state_identity): Likewise. * pthread_support.c (GC_new_thread, GC_lookup_thread, GC_get_nprocs, pthread_sigmask, pthread_create): Likewise. * ptr_chck.c (GC_same_obj, GC_default_is_visible_print_proc, GC_default_is_valid_displacement_print_proc, GC_is_visible, GC_pre_incr, GC_post_incr): Likewise. * reclaim.c (GC_block_empty, GC_reclaim_uninit, GC_n_set_marks, GC_reclaim_all): Likewise. * tests/cpp.cc (main): Likewise. * tests/gctest.c (fake_gcj_mark_proc, reverse1, reverse, ints, gcj_reverse1, gcj_reverse, gcj_ints, uncollectable_ints, mktree, alloc8bytes, main, test): Likewise. * tools/if_mach.c (main): Likewise. * tools/if_not_there.c (main): Likewise. * tools/setjmp_t.c (getpagesize, main, g): Likewise. * typd_mlc.c (GC_add_ext_descriptor, GC_add_ext_descriptor, GC_double_descr, GC_make_array_descriptor, GC_make_sequence_descriptor, GC_typed_mark_proc, GC_descr_obj_size, GC_push_complex_descriptor, GC_array_mark_proc, GC_make_descriptor, GC_calloc_explicitly_typed): Likewise. * win32_threads.c (GC_new_thread, GC_lookup_thread_inner, GC_get_stack_min, GC_pthread_create, GC_pthread_start_inner): Likewise. * allchblk.c (GC_get_first_part, GC_allochblk_nth): Replace 0 to NULL where appropriate. * alloc.c (GC_allocobj): Likewise. * blacklst.c (GC_is_black_listed): Likewise. * cord/cordbscs.c (CORD_from_fn_inner, CORD_substr_checked): Likewise. * cord/cordxtra.c (CORD_cat_char, CORD_to_char_star, CORD_from_char_star, CORD_lf_func, CORD_from_file_lazy_inner): Likewise. * dbg_mlc.c (store_debug_info, GC_debug_generic_malloc, GC_debug_generic_malloc): Likewise. * dyn_load.c (GC_FirstDLOpenedLinkMap): Likewise. * gcj_mlc.c (GC_debug_gcj_malloc): Likewise. * headers.c (GC_next_block, GC_prev_block): Likewise. * malloc.c (GC_generic_malloc, strdup): Likewise. * mallocx.c (GC_realloc): Likewise. * misc.c (GC_default_oom_fn, GC_base): Likewise. * os_dep.c (GC_get_main_stack_base, os2_alloc, GC_win32_get_mem): Likewise. * pthread_support.c (GC_new_thread, GC_lookup_thread): Likewise. * ptr_chck.c (GC_same_obj, GC_is_visible, GC_default_is_valid_displacement_print_proc): Likewise. * tests/gctest.c (mktree): Likewise. * typd_mlc.c (GC_make_array_descriptor, GC_push_complex_descriptor, GC_array_mark_proc, GC_calloc_explicitly_typed): Likewise. * win32_threads.c (GC_new_thread, GC_lookup_thread_inner): Likewise. * alloc.c (GC_never_stop_func, GC_timeout_stop_func): Replace 0 and 1 (in return statement) to FALSE and TRUE, respectively. * include/private/gcconfig.h: Remove outermost parentheses in the expression of return statement in comment. --- ptr_chck.c | 54 +++++++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) (limited to 'ptr_chck.c') diff --git a/ptr_chck.c b/ptr_chck.c index 8894644b..5d2896e2 100644 --- a/ptr_chck.c +++ b/ptr_chck.c @@ -45,12 +45,12 @@ GC_API void * GC_CALL GC_same_obj(void *p, void *q) if (!EXPECT(GC_is_initialized, TRUE)) GC_init(); hhdr = HDR((word)p); - if (hhdr == 0) { + if (NULL == hhdr) { if (divHBLKSZ((word)p) != divHBLKSZ((word)q) - && HDR((word)q) != 0) { + && HDR((word)q) != NULL) { goto fail; } - return(p); + return p; } /* If it's a pointer to the middle of a large object, move it */ /* to the beginning. */ @@ -66,7 +66,7 @@ GC_API void * GC_CALL GC_same_obj(void *p, void *q) || (word)q < (word)h) { goto fail; } - return(p); + return p; } sz = hhdr -> hb_sz; if (sz > MAXOBJBYTES) { @@ -94,10 +94,10 @@ GC_API void * GC_CALL GC_same_obj(void *p, void *q) if ((word)q >= (word)limit || (word)q < (word)base) { goto fail; } - return(p); + return p; fail: (*GC_same_obj_print_proc)((ptr_t)p, (ptr_t)q); - return(p); + return p; } STATIC void GC_CALLBACK GC_default_is_valid_displacement_print_proc (void *p) @@ -125,7 +125,7 @@ GC_API void * GC_CALL GC_is_valid_displacement(void *p) if (!EXPECT(GC_is_initialized, TRUE)) GC_init(); if (NULL == p) return NULL; hhdr = HDR((word)p); - if (hhdr == 0) return(p); + if (NULL == hhdr) return p; h = HBLKPTR(p); if (GC_all_interior_pointers) { while (IS_FORWARDING_ADDR_OR_NIL(hhdr)) { @@ -144,10 +144,10 @@ GC_API void * GC_CALL GC_is_valid_displacement(void *p) && !IS_FORWARDING_ADDR_OR_NIL(HDR(h + 1)))) { goto fail; } - return(p); + return p; fail: (*GC_is_valid_displacement_print_proc)((ptr_t)p); - return(p); + return p; } STATIC void GC_CALLBACK GC_default_is_visible_print_proc(void * p) @@ -165,15 +165,15 @@ void (GC_CALLBACK *GC_is_visible_print_proc)(void * p) = # ifdef STACK_GROWS_DOWN if ((word)p >= (word)GC_approx_sp() && (word)p < (word)GC_stackbottom) { - return(TRUE); + return TRUE; } # else if ((word)p <= (word)GC_approx_sp() && (word)p > (word)GC_stackbottom) { - return(TRUE); + return TRUE; } # endif - return(FALSE); + return FALSE; } #endif /* !THREADS */ @@ -193,24 +193,23 @@ GC_API void * GC_CALL GC_is_visible(void *p) if (!EXPECT(GC_is_initialized, TRUE)) GC_init(); # ifdef THREADS hhdr = HDR((word)p); - if (hhdr != 0 && GC_base(p) == 0) { + if (hhdr != NULL && NULL == GC_base(p)) { goto fail; } else { /* May be inside thread stack. We can't do much. */ - return(p); + return p; } # else /* Check stack first: */ - if (GC_on_stack(p)) return(p); + if (GC_on_stack(p)) return p; hhdr = HDR((word)p); - if (hhdr == 0) { - if (GC_is_static_root(p)) return(p); + if (NULL == hhdr) { + if (GC_is_static_root(p)) return p; /* Else do it again correctly: */ # if defined(DYNAMIC_LOADING) || defined(MSWIN32) \ || defined(MSWINCE) || defined(CYGWIN32) || defined(PCR) GC_register_dynamic_libraries(); - if (GC_is_static_root(p)) - return(p); + if (GC_is_static_root(p)) return p; # endif goto fail; } else { @@ -249,33 +248,34 @@ GC_API void * GC_CALL GC_is_visible(void *p) } goto retry; } - return(p); + return p; } # endif fail: (*GC_is_visible_print_proc)((ptr_t)p); - return(p); + return p; } -GC_API void * GC_CALL GC_pre_incr (void **p, ptrdiff_t how_much) +GC_API void * GC_CALL GC_pre_incr(void **p, ptrdiff_t how_much) { void * initial = *p; void * result = GC_same_obj((void *)((ptr_t)initial + how_much), initial); if (!GC_all_interior_pointers) { - (void) GC_is_valid_displacement(result); + (void)GC_is_valid_displacement(result); } - return (*p = result); + *p = result; + return result; /* updated pointer */ } -GC_API void * GC_CALL GC_post_incr (void **p, ptrdiff_t how_much) +GC_API void * GC_CALL GC_post_incr(void **p, ptrdiff_t how_much) { void * initial = *p; void * result = GC_same_obj((void *)((ptr_t)initial + how_much), initial); if (!GC_all_interior_pointers) { - (void) GC_is_valid_displacement(result); + (void)GC_is_valid_displacement(result); } *p = result; - return(initial); + return initial; /* original *p */ } -- cgit v1.2.1