summaryrefslogtreecommitdiff
path: root/alloc.c
diff options
context:
space:
mode:
authorIvan Maidanski <ivmai@mail.ru>2012-12-11 09:28:12 +0400
committerIvan Maidanski <ivmai@mail.ru>2012-12-11 15:28:38 +0400
commit1c3d8e3f6a963c32c5365ff52a9ebc6d65c088ce (patch)
tree090b306ecc7cb3126639fe1177964531e72df903 /alloc.c
parentdb6df7562ce3dbf5e4eb4269229dee780f489440 (diff)
downloadbdwgc-1c3d8e3f6a963c32c5365ff52a9ebc6d65c088ce.tar.gz
Replace GC_log/err_printf() followed by ABORT with ABORT_ARGn()
(code refactoring) * allchblk.c (GC_freehblk): Replace GC_COND_LOG_PRINTF (or GC_log_printf, or GC_err_printf) followed by ABORT with ABORT_ARG<n> (where 'n' is the number of arguments matching format string). * alloc.c (GC_check_fl_marks): Likewise. * dbg_mlc.c (GC_debug_change_stubborn, GC_debug_end_stubborn_change, GC_debug_free, GC_debug_realloc): Likewise. * dyn_load.c (GC_register_dynamic_libraries): Likewise. * os_dep.c (GC_get_maps, GC_register_data_segments, GC_remap, PROTECT, GC_write_fault_handler, GC_mprotect_thread): Likewise. * pthread_stop_world.c (GC_suspend_all, GC_start_world): Likewise. * ptr_chck.c (GC_default_same_obj_print_proc, GC_default_is_valid_displacement_print_proc, GC_default_is_visible_print_proc): Likewise. * specific.c (GC_check_tsd_marks): Likewise. * win32_threads.c (GC_register_my_thread_inner): Likewise. * include/private/gc_priv.h (ABORT_ARG1, ABORT_ARG2, ABORT_ARG3): New macro.
Diffstat (limited to 'alloc.c')
-rw-r--r--alloc.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/alloc.c b/alloc.c
index 97f88916..8a64de13 100644
--- a/alloc.c
+++ b/alloc.c
@@ -736,9 +736,8 @@ GC_INNER void GC_set_fl_marks(ptr_t q)
AO_t *next;
if (!GC_is_marked(p)) {
- GC_err_printf("Unmarked object %p on list %p\n",
- (void *)p, (void *)list);
- ABORT("Unmarked local free list entry");
+ ABORT_ARG2("Unmarked local free list entry",
+ ": object %p on list %p", (void *)p, (void *)list);
}
/* While traversing the free-list, it re-reads the pointer to */