From 36bd6c283383851664bbe598601c99385e5dcd43 Mon Sep 17 00:00:00 2001 From: Jakob Kaivo Date: Wed, 31 Jan 2024 00:00:51 -0500 Subject: make tweaks to work with 1:1 checked functions --- src/stdlib/__stdlib.c | 4 ++++ src/stdlib/abort_handler_s.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'src/stdlib') diff --git a/src/stdlib/__stdlib.c b/src/stdlib/__stdlib.c index a95b7ef7..d1006bec 100644 --- a/src/stdlib/__stdlib.c +++ b/src/stdlib/__stdlib.c @@ -1,5 +1,9 @@ #include "_stdlib.h" +#if ! (__STDC_VERSION__ >= 201112 && defined __STDC_WANT_LIB_EXT1__) +#define abort_handler_s __abort_handler_s +#endif + struct __stdlib __stdlib = { .constraint_handler = abort_handler_s, }; diff --git a/src/stdlib/abort_handler_s.c b/src/stdlib/abort_handler_s.c index 4b1e3f03..cff0d539 100644 --- a/src/stdlib/abort_handler_s.c +++ b/src/stdlib/abort_handler_s.c @@ -1,7 +1,7 @@ #include #include #include -//#include +#include #include "errno/errno_t.h" #include "_stdlib.h" @@ -17,7 +17,7 @@ void abort_handler_s(const char * restrict msg, void * restrict ptr, errno_t err /* TODO: map numbers to names as well */ printf("While handling signal %d: ", ci->signal); } - printf("Function %s()", ci->func); + if (__checked_call.file) { printf(" ("); if (__checked_call.func) { -- cgit v1.2.1