From cbfdcbe723cf9a46d1d12dc947d943ff5db86cbe Mon Sep 17 00:00:00 2001
From: Robert Izzard <r.izzard@surrey.ac.uk>
Date: Mon, 4 Nov 2019 14:54:43 +0000
Subject: [PATCH] improve macros for error description in buffered_printf
---
src/buffering/buffered_printf.c | 14 +++++++-------
src/buffering/buffering_macros.h | 10 +++++-----
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/buffering/buffered_printf.c b/src/buffering/buffered_printf.c
index 37de93182..20e8ac694 100644
--- a/src/buffering/buffered_printf.c
+++ b/src/buffering/buffered_printf.c
@@ -5,12 +5,12 @@
/*
* testing settings
*/
-/*
- #undef BUFFERED_STRING_OVERRUN_WARNINGS
- #define BUFFERED_STRING_OVERRUN_WARNINGS
- #undef BUFFERED_PRINTF_MAX_BUFFER_SIZE
- #define BUFFERED_PRINTF_MAX_BUFFER_SIZE ((size_t)(1024*2))
-*/
+
+#undef BUFFERED_STRING_OVERRUN_WARNINGS
+#define BUFFERED_STRING_OVERRUN_WARNINGS
+#undef BUFFERED_PRINTF_MAX_BUFFER_SIZE
+#define BUFFERED_PRINTF_MAX_BUFFER_SIZE ((size_t)(1024*2))
+
static size_t __deslash(char * const string);
static void __buffered_printf_error(struct tmpstore_t * t,
@@ -306,7 +306,7 @@ int Gnu_format_args(3,4) buffered_printf(
{
__buffered_printf_error(
stardata->tmpstore,
- "SYSTEM_ERROR buffered_printf uncaught problem %d \"%s\" : time = %g\n",
+ "SYSTEM_ERROR buffered_printf error %d \"%s\" : time = %g\n",
retval,
Buffered_printf_error_string(retval),
stardata->model.time
diff --git a/src/buffering/buffering_macros.h b/src/buffering/buffering_macros.h
index 1cc335d93..3445be578 100644
--- a/src/buffering/buffering_macros.h
+++ b/src/buffering/buffering_macros.h
@@ -17,11 +17,11 @@
*/
#define Buffered_printf_error_string(N) \
( \
- (N) == BUFFERED_PRINTF_GENERIC_ERROR ? "Generic" : \
- (N) == BUFFERED_PRINTF_ASPRINTF_ERROR ? "asprintf" : \
- (N) == BUFFERED_PRINTF_ALLOC_ERROR ? "alloc" : \
- (N) == BUFFERED_PRINTF_FULL_ERROR ? "full" : \
- (N) == BUFFERED_PRINTF_STARDATA_ERROR ? "stardata" : \
+ (N) == BUFFERED_PRINTF_GENERIC_ERROR ? "generic problem" : \
+ (N) == BUFFERED_PRINTF_ASPRINTF_ERROR ? "asprintf failed" : \
+ (N) == BUFFERED_PRINTF_ALLOC_ERROR ? "alloc failed" : \
+ (N) == BUFFERED_PRINTF_FULL_ERROR ? "buffer is full" : \
+ (N) == BUFFERED_PRINTF_STARDATA_ERROR ? "stardata or stardata->tmpstore is NULL" : \
"unknown" \
)
--
GitLab