diff options
author | Ivan Maidanski <ivmai@mail.ru> | 2022-04-30 19:00:14 +0300 |
---|---|---|
committer | Ivan Maidanski <ivmai@mail.ru> | 2022-05-01 00:22:50 +0300 |
commit | d833880a0f3cab314cd1f06a1a1bec5024cfdacd (patch) | |
tree | 2946a5fa0779341719b677e08d97c53626646610 /cord/cordprnt.c | |
parent | dad61d707e943043174e171cc1b2b6a1497a0d36 (diff) | |
download | bdwgc-d833880a0f3cab314cd1f06a1a1bec5024cfdacd.tar.gz |
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.
Diffstat (limited to 'cord/cordprnt.c')
-rw-r--r-- | cord/cordprnt.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/cord/cordprnt.c b/cord/cordprnt.c index b3ac6367..72021f8c 100644 --- a/cord/cordprnt.c +++ b/cord/cordprnt.c @@ -88,7 +88,7 @@ static int extract_conv_spec(CORD_pos source, char *buf, *width = NONE; buf[chars_so_far++] = '%'; while(CORD_pos_valid(source)) { - if (chars_so_far >= CONV_SPEC_LEN) return(-1); + if (chars_so_far >= CONV_SPEC_LEN) return -1; current = CORD_pos_fetch(source); buf[chars_so_far++] = current; switch(current) { @@ -166,11 +166,11 @@ static int extract_conv_spec(CORD_pos source, char *buf, case 'r': goto done; default: - return(-1); + return -1; } CORD_next(source); } - return(-1); + return -1; done: if (saw_number) { if (saw_period) { @@ -183,7 +183,7 @@ static int extract_conv_spec(CORD_pos source, char *buf, *prec = NONE; } buf[chars_so_far] = '\0'; - return(result); + return result; } #if defined(__DJGPP__) || defined(__STRICT_ANSI__) @@ -213,7 +213,7 @@ int CORD_vsprintf(CORD * out, CORD format, va_list args) current = CORD_pos_fetch(pos); if (current == '%') { CORD_next(pos); - if (!CORD_pos_valid(pos)) return(-1); + if (!CORD_pos_valid(pos)) return -1; current = CORD_pos_fetch(pos); if (current == '%') { CORD_ec_append(result, current); @@ -227,7 +227,7 @@ int CORD_vsprintf(CORD * out, CORD format, va_list args) if (extract_conv_spec(pos, conv_spec, &width, &prec, &left_adj, &long_arg) < 0) { - return(-1); + return -1; } current = CORD_pos_fetch(pos); switch(current) { @@ -257,7 +257,7 @@ int CORD_vsprintf(CORD * out, CORD format, va_list args) arg = va_arg(args, CORD); len = CORD_len(arg); if (prec != NONE && len > (unsigned)prec) { - if (prec < 0) return(-1); + if (prec < 0) return -1; arg = CORD_substr(arg, 0, (unsigned)prec); len = (unsigned)prec; } @@ -374,7 +374,7 @@ int CORD_vsprintf(CORD * out, CORD format, va_list args) /* old style vsprintf */ len = strlen(buf); } else if (res < 0) { - return(-1); + return -1; } if (buf != result[0].ec_bufptr) { char c; @@ -394,7 +394,7 @@ int CORD_vsprintf(CORD * out, CORD format, va_list args) } count = ec_len(result); *out = CORD_balance(CORD_ec_to_cord(result)); - return(count); + return count; } int CORD_sprintf(CORD * out, CORD format, ...) @@ -405,7 +405,7 @@ int CORD_sprintf(CORD * out, CORD format, ...) va_start(args, format); result = CORD_vsprintf(out, format, args); va_end(args); - return(result); + return result; } int CORD_fprintf(FILE * f, CORD format, ...) @@ -418,7 +418,7 @@ int CORD_fprintf(FILE * f, CORD format, ...) result = CORD_vsprintf(&out, format, args); va_end(args); if (result > 0) CORD_put(out, f); - return(result); + return result; } int CORD_vfprintf(FILE * f, CORD format, va_list args) @@ -428,7 +428,7 @@ int CORD_vfprintf(FILE * f, CORD format, va_list args) result = CORD_vsprintf(&out, format, args); if (result > 0) CORD_put(out, f); - return(result); + return result; } int CORD_printf(CORD format, ...) @@ -441,7 +441,7 @@ int CORD_printf(CORD format, ...) result = CORD_vsprintf(&out, format, args); va_end(args); if (result > 0) CORD_put(out, stdout); - return(result); + return result; } int CORD_vprintf(CORD format, va_list args) @@ -451,5 +451,5 @@ int CORD_vprintf(CORD format, va_list args) result = CORD_vsprintf(&out, format, args); if (result > 0) CORD_put(out, stdout); - return(result); + return result; } |