From 3b042f1f72a364a8b1d1ebae533d17d23f091eb0 Mon Sep 17 00:00:00 2001
From: Jakob Kaivo <jkk@ung.org>
Date: Wed, 5 Jun 2024 14:56:31 -0400
Subject: rename ___signal to __signal_h

---
 src/__undefined.c             |  2 +-
 src/_safety.h                 |  4 ++--
 src/signal/__signal.c         |  8 --------
 src/signal/__signal_h.c       |  8 ++++++++
 src/signal/__signal_handler.c | 10 +++++-----
 src/signal/_signal.h          |  2 +-
 src/signal/signal.c           |  6 +++---
 src/stdlib/__jkmalloc.c       |  2 +-
 8 files changed, 21 insertions(+), 21 deletions(-)
 delete mode 100644 src/signal/__signal.c
 create mode 100644 src/signal/__signal_h.c

(limited to 'src')

diff --git a/src/__undefined.c b/src/__undefined.c
index 6f619393..da9d0d90 100644
--- a/src/__undefined.c
+++ b/src/__undefined.c
@@ -7,7 +7,7 @@
 
 _Noreturn void __undefined(const char *fmt, ...)
 {
-	___signal.current = 0;
+	__signal_h.current = 0;
 
 	va_list ap;
 	va_start(ap, fmt);
diff --git a/src/_safety.h b/src/_safety.h
index 5f8dadc4..5024e52f 100644
--- a/src/_safety.h
+++ b/src/_safety.h
@@ -107,8 +107,8 @@ extern struct __dangerous {
 } while (0)
 
 #define SIGNAL_SAFE(__n) do { \
-	if (__n == 0 && ___signal.current != 0) { \
-		int _sig = ___signal.current; \
+	if (__n == 0 && __signal_h.current != 0) { \
+		int _sig = __signal_h.current; \
 		UNDEFINED("Function %s() is not safe to call from a signal handler (signal %d)", __func__, _sig); \
 	} \
 } while (0)
diff --git a/src/signal/__signal.c b/src/signal/__signal.c
deleted file mode 100644
index d4a819c6..00000000
--- a/src/signal/__signal.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "_signal.h"
-
-struct __signal ___signal = {0};
-
-/*
-STDC(0)
-SIGNAL_SAFE(0)
-*/
diff --git a/src/signal/__signal_h.c b/src/signal/__signal_h.c
new file mode 100644
index 00000000..fde51b63
--- /dev/null
+++ b/src/signal/__signal_h.c
@@ -0,0 +1,8 @@
+#include "_signal.h"
+
+struct __signal __signal_h = { 0 };
+
+/*
+STDC(0)
+SIGNAL_SAFE(0)
+*/
diff --git a/src/signal/__signal_handler.c b/src/signal/__signal_handler.c
index c7a4675c..2e8afd1e 100644
--- a/src/signal/__signal_handler.c
+++ b/src/signal/__signal_handler.c
@@ -9,18 +9,18 @@ void __signal_handler(int sig)
 		UNDEFINED("signal %d occured during quick_exit", sig);
 	}
 
-	___signal.current = sig;
-	if (___signal.handlers[sig] != NULL) {
-		___signal.handlers[sig](sig);
+	__signal_h.current = sig;
+	if (__signal_h.handlers[sig] != NULL) {
+		__signal_h.handlers[sig](sig);
 	}
 
 	/* TODO: signal number to name */
 	if (sig == SIGFPE || sig == SIGILL || sig == SIGSEGV) {
-		___signal.current = 0;
+		__signal_h.current = 0;
 		UNDEFINED("Signal handler for signal %d returned", sig);
 	}
 
-	___signal.current = 0;
+	__signal_h.current = 0;
 }
 
 /*
diff --git a/src/signal/_signal.h b/src/signal/_signal.h
index 40a01fa0..f450c053 100644
--- a/src/signal/_signal.h
+++ b/src/signal/_signal.h
@@ -10,7 +10,7 @@ typedef void (*handler)(int);
 extern struct __signal {
 	int current;
 	handler handlers[NSIGNALS];
-} ___signal;
+} __signal_h;
 
 void __signal_handler(int);
 
diff --git a/src/signal/signal.c b/src/signal/signal.c
index 6a48b49a..85a82172 100644
--- a/src/signal/signal.c
+++ b/src/signal/signal.c
@@ -27,7 +27,7 @@ GCC_SSE_HACK
 void (*signal(int sig, void (*func)(int)))(int)
 {
 	/* signal safe iff we are resetting the current signal handler */
-	SIGNAL_SAFE((___signal.current == sig));
+	SIGNAL_SAFE((__signal_h.current == sig));
 
 	if (sig < 0 || sig > NSIGNALS) {
 		/* FIXME: should errno be set? */
@@ -38,8 +38,8 @@ void (*signal(int sig, void (*func)(int)))(int)
 		UNDEFINED("signal handler is not executable");
 	}
 
-	void (*prev)(int) = ___signal.handlers[sig];
-	___signal.handlers[sig] = func;
+	void (*prev)(int) = __signal_h.handlers[sig];
+	__signal_h.handlers[sig] = func;
 
 	struct sigaction act = { 0 };
 	act.sa_handler = __signal_handler;
diff --git a/src/stdlib/__jkmalloc.c b/src/stdlib/__jkmalloc.c
index e128a394..34b34fbc 100644
--- a/src/stdlib/__jkmalloc.c
+++ b/src/stdlib/__jkmalloc.c
@@ -119,7 +119,7 @@ static void *__jk_page_alloc(size_t npages)
 
 static void __jk_sigaction(int sig, siginfo_t *si, void *addr)
 {
-	___signal.current = 0;
+	__signal_h.current = 0;
 
 	(void)sig; (void)addr;
 
-- 
cgit v1.2.1