update k2v3

Author: Moe-hacker

v3/k2v3.c

@@ -28,9 +28,42 @@
  *
  */
 #include "k2v3.h"
-bool k2v_stop_at_warning = false;
-bool k2v_show_warning = true;
-bool k2v3_warning_triggered = false;
+bool k2v3_stop_at_warning(int req)
+{
+	static thread_local bool ret = false;
+	if (req == -1) {
+		return ret;
+	}
+	if (req == 0) {
+		ret = false;
+	} else {
+		ret = true;
+	}
+	return ret;
+}
+bool k2v3_show_warning(int req)
+{
+	static thread_local bool ret = false;
+	if (req == -1) {
+		return ret;
+	}
+	if (req == 0) {
+		ret = false;
+	} else {
+		ret = true;
+	}
+	return ret;
+}
+enum K2V3_ERRNO k2v3_errno(enum K2V3_ERRNO req)
+{
+	static thread_local enum K2V3_ERRNO ret = K2V3_NORMAL;
+	if (req == K2V3_QUERY) {
+		return ret;
+	}
+	ret = req;
+	return ret;
+}
+thread_local jmp_buf k2v3_jmp;
 //
 //
 // Parse into cache.
@@ -476,6 +509,11 @@ static struct K2V3_VALUE get_value(struct K2V3_STRING conf)
 k2v3_cache k2v3_parse(char *const _Nonnull buf)
 {
 	k2v3_cache ret = NULL;
+	if (setjmp(k2v3_jmp) != 0) {
+		// Free cache before returning NULL.
+		k2v3_free_cache(&ret);
+		return NULL;
+	}
 	struct K2V3_STRING conf = { .str = buf, .len = strlen(buf) };
 	while (conf.len > 0) {
 		// We do not allow leading spaces.

v3/k2v3.h

@@ -37,13 +37,15 @@
 #include <string.h>
 #include <stdlib.h>
 #include <limits.h>
+#include <threads.h>
+#include <setjmp.h>
 #include <sys/stat.h>
 // Bool!!!
 #if __STDC_VERSION__ < 202000L
 #ifndef bool
 #define bool _Bool
-#define true ((_Bool) + 1u)
-#define false ((_Bool) + 0u)
+#define true ((_Bool)1u)
+#define false ((_Bool)0u)
 #endif
 #endif
 #ifndef _Nullable
@@ -69,25 +71,37 @@ struct K2V3_BUF {
 	struct K2V3_BUF *next;
 };
 typedef struct K2V3_BUF *k2v3_cache;
-extern bool k2v_stop_at_warning;
-extern bool k2v_show_warning;
-extern bool k2v3_warning_triggered;
+enum K2V3_ERRNO {
+	K2V3_QUERY,
+	K2V3_NORMAL,
+	K2V3_RECOVERABLE,
+	K2V3_UNRECOVERABLE,
+};
+bool k2v3_stop_at_warning(int req);
+bool k2v3_show_warning(int req);
+enum K2V3_ERRNO k2v3_errno(enum K2V3_ERRNO req);
+extern thread_local jmp_buf k2v3_jmp;
 #define k2v3_error(...)                                                                             \
 	do {                                                                                        \
+		k2v3_errno(K2V3_UNRECOVERABLE);                                                     \
 		fprintf(stderr, "[libk2v]: in %s() at %s line %d :", __func__, __FILE__, __LINE__); \
 		fprintf(stderr, __VA_ARGS__);                                                       \
 		fprintf(stderr, "\n");                                                              \
-		exit(114);                                                                          \
+		if (k2v3_stop_at_warning(-1)) {                                                     \
+			fprintf(stderr, "[libk2v]: k2v_stop_at_warning set, exit\n");               \
+			exit(114);                                                                  \
+		}                                                                                   \
+		longjmp(k2v3_jmp, 1);                                                               \
 	} while (0)
 #define k2v3_warning(...)                                                                                   \
 	do {                                                                                                \
-		k2v3_warning_triggered = true;                                                              \
-		if (k2v_show_warning || k2v_stop_at_warning) {                                              \
+		k2v3_errno(K2V3_RECOVERABLE);                                                               \
+		if (k2v3_show_warning(-1) || k2v3_stop_at_warning(-1)) {                                    \
 			fprintf(stderr, "[libk2v]: in %s() at %s line %d :", __func__, __FILE__, __LINE__); \
 			fprintf(stderr, __VA_ARGS__);                                                       \
 			fprintf(stderr, "\n");                                                              \
 		}                                                                                           \
-		if (k2v_stop_at_warning) {                                                                  \
+		if (k2v3_stop_at_warning(-1)) {                                                             \
 			fprintf(stderr, "[libk2v]: k2v_stop_at_warning set, exit\n");                       \
 			exit(114);                                                                          \
 		}                                                                                           \

v3/test.c

@@ -2,8 +2,20 @@
 #include "../src/include/k2v.h"
 int main()
 {
+	k2v3_stop_at_warning(0);
 	char *buf = k2v3_open_file("test.conf");
 	k2v3_cache cache = k2v3_parse(buf);
+	switch (k2v3_errno(K2V3_QUERY)) {
+	case K2V3_UNRECOVERABLE:
+		printf("Unrecoverable error occurred during parsing.\n");
+		break;
+	case K2V3_RECOVERABLE:
+		printf("Recoverable error occurred during parsing.\n");
+		break;
+	default:
+		printf("No errors occurred during parsing.\n");
+		break;
+	}
 	k2v3_dump(cache);
 	printf("\n\n");
 	printf("bool_val: %s\n", k2v3_get_bool("bool_val", cache) ? "true" : "false");