From 6ec7d2d87764e25d58dcb7ffdcb02b58bcce18d8 Mon Sep 17 00:00:00 2001
From: Dirk Hohndel <dirk@hohndel.org>
Date: Thu, 26 Oct 2017 14:33:02 +0200
Subject: Move error reporting into its own source file

This doesn't really seem to belong in save_git.c.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
---
 core/errorhelper.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 core/errorhelper.c

(limited to 'core/errorhelper.c')

diff --git a/core/errorhelper.c b/core/errorhelper.c
new file mode 100644
index 000000000..c8e6ae956
--- /dev/null
+++ b/core/errorhelper.c
@@ -0,0 +1,46 @@
+// SPDX-License-Identifier: GPL-2.0
+#ifdef __clang__
+// Clang has a bug on zero-initialization of C structs.
+#pragma clang diagnostic ignored "-Wmissing-field-initializers"
+#endif
+#include "dive.h"
+#include "membuffer.h"
+
+#define VA_BUF(b, fmt) do { va_list args; va_start(args, fmt); put_vformat(b, fmt, args); va_end(args); } while (0)
+
+static struct membuffer error_string_buffer = { 0 };
+/*
+ * Note that the act of "getting" the error string
+ * buffer doesn't de-allocate the buffer, but it does
+ * set the buffer length to zero, so that any future
+ * error reports will overwrite the string rather than
+ * append to it.
+ */
+const char *get_error_string(void)
+{
+	const char *str;
+
+	if (!error_string_buffer.len)
+		return "";
+	str = mb_cstring(&error_string_buffer);
+	error_string_buffer.len = 0;
+	return str;
+}
+
+int report_error(const char *fmt, ...)
+{
+	struct membuffer *buf = &error_string_buffer;
+
+	/* Previous unprinted errors? Add a newline in between */
+	if (buf->len)
+		put_bytes(buf, "\n", 1);
+	VA_BUF(buf, fmt);
+	mb_cstring(buf);
+
+	return -1;
+}
+
+void report_message(const char *msg)
+{
+	(void)report_error("%s", msg);
+}
-- 
cgit v1.2.3-70-g09d2


From eccd4b993a7cc47e96ddab486197570c38f21701 Mon Sep 17 00:00:00 2001
From: Dirk Hohndel <dirk@hohndel.org>
Date: Thu, 26 Oct 2017 14:37:29 +0200
Subject: Set error callback helper

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
---
 core/dive.h        | 1 +
 core/errorhelper.c | 9 +++++++++
 2 files changed, 10 insertions(+)

(limited to 'core/errorhelper.c')

diff --git a/core/dive.h b/core/dive.h
index 64dee5196..f72aaf1d5 100644
--- a/core/dive.h
+++ b/core/dive.h
@@ -698,6 +698,7 @@ extern "C" {
 extern int report_error(const char *fmt, ...);
 extern void report_message(const char *msg);
 extern const char *get_error_string(void);
+extern void set_error_cb(void(*cb)(void));
 
 extern struct dive *find_dive_including(timestamp_t when);
 extern bool dive_within_time_range(struct dive *dive, timestamp_t when, timestamp_t offset);
diff --git a/core/errorhelper.c b/core/errorhelper.c
index c8e6ae956..66c01fd21 100644
--- a/core/errorhelper.c
+++ b/core/errorhelper.c
@@ -9,6 +9,7 @@
 #define VA_BUF(b, fmt) do { va_list args; va_start(args, fmt); put_vformat(b, fmt, args); va_end(args); } while (0)
 
 static struct membuffer error_string_buffer = { 0 };
+static void (*error_cb)(void) = NULL;
 /*
  * Note that the act of "getting" the error string
  * buffer doesn't de-allocate the buffer, but it does
@@ -37,6 +38,10 @@ int report_error(const char *fmt, ...)
 	VA_BUF(buf, fmt);
 	mb_cstring(buf);
 
+	/* if an error callback is registered, call it */
+	if (error_cb)
+		error_cb();
+
 	return -1;
 }
 
@@ -44,3 +49,7 @@ void report_message(const char *msg)
 {
 	(void)report_error("%s", msg);
 }
+
+void set_error_cb(void(*cb)(void)) {
+	error_cb = cb;
+}
-- 
cgit v1.2.3-70-g09d2