From 7bf78d58550c76a07ea1535897cfd69145dcbd3b Mon Sep 17 00:00:00 2001
From: Kubat <mael.martin31@gmail.com>
Date: Sat, 30 Oct 2021 11:25:22 +0200
Subject: [PATCH] MISC: The double `_` is reserved, use `___` instead
---
inc/lektor/net.h | 10 +++---
src/base/commands.c | 2 +-
src/net/listen.c | 80 ++++++++++++++++++++++-----------------------
3 files changed, 46 insertions(+), 46 deletions(-)
diff --git a/inc/lektor/net.h b/inc/lektor/net.h
index 264fc31b..b9ec7ee3 100644
--- a/inc/lektor/net.h
+++ b/inc/lektor/net.h
@@ -75,11 +75,11 @@ struct lkt_state {
/* Signal handlers for this server.
* Catch them all! */
- void (*__signal_INT)(struct lkt_state *);
- void (*__signal_ILL)(struct lkt_state *);
- void (*__signal_QUIT)(struct lkt_state *);
- void (*__signal_USR1)(struct lkt_state *);
- void (*__signal_USR2)(struct lkt_state *);
+ void (*___signal_INT)(struct lkt_state *);
+ void (*___signal_ILL)(struct lkt_state *);
+ void (*___signal_QUIT)(struct lkt_state *);
+ void (*___signal_USR1)(struct lkt_state *);
+ void (*___signal_USR2)(struct lkt_state *);
};
/* Send a message to the connected client. */
diff --git a/src/base/commands.c b/src/base/commands.c
index 52598757..f1f50b6a 100644
--- a/src/base/commands.c
+++ b/src/base/commands.c
@@ -69,7 +69,7 @@ bool
command_kill(struct lkt_state *srv, size_t c, char UNUSED *argv[LKT_MESSAGE_ARGS_MAX])
{
RETURN_UNLESS(lkt_client_auth(srv, c, false), "Failed to authentificate user", false);
- srv->__signal_INT(srv);
+ srv->___signal_INT(srv);
LOG_FATAL("The SIGINT handler returned, now exiting");
}
diff --git a/src/net/listen.c b/src/net/listen.c
index 228413e4..0d058459 100644
--- a/src/net/listen.c
+++ b/src/net/listen.c
@@ -1074,35 +1074,35 @@ redo:
* Signal handlers *
*******************/
-static int __lkt_signal_INT = 0; /* SIGINT => close the server */
-static int __lkt_signal_QUIT = 0; /* SIGQUIT => close the server */
-static int __lkt_signal_ILL = 0; /* SIGILL => NoT veRy HappY */
-static int __lkt_signal_USR1 = 0; /* SIGUSR1 => not used */
-static int __lkt_signal_USR2 = 0; /* SIGUSR2 => not used */
+static int ___lkt_signal_INT = 0; /* SIGINT => close the server */
+static int ___lkt_signal_QUIT = 0; /* SIGQUIT => close the server */
+static int ___lkt_signal_ILL = 0; /* SIGILL => NoT veRy HappY */
+static int ___lkt_signal_USR1 = 0; /* SIGUSR1 => not used */
+static int ___lkt_signal_USR2 = 0; /* SIGUSR2 => not used */
PRIVATE_FUNCTION void
-__signal_handler(int sig)
+___signal_handler(int sig)
{
-#define __HANDLE(signal) \
+#define ___HANDLE(signal) \
case SIG##signal: \
LOG_INFO("SIGNAL", "Got signal SIG" #signal); \
- __lkt_signal_##signal = 1; \
+ ___lkt_signal_##signal = 1; \
break;
switch (sig) {
- __HANDLE(INT)
- __HANDLE(ILL)
- __HANDLE(QUIT)
- __HANDLE(USR1)
- __HANDLE(USR2)
+ ___HANDLE(INT)
+ ___HANDLE(ILL)
+ ___HANDLE(QUIT)
+ ___HANDLE(USR1)
+ ___HANDLE(USR2)
default: LOG_WARN("SIGNAL", "Not handled signal %d", sig); break;
}
-#undef __HANDLE
+#undef ___HANDLE
}
PRIVATE_FUNCTION EXIT_FUNCTION
-__lkt_handle_INT(struct lkt_state *srv)
+___lkt_handle_INT(struct lkt_state *srv)
{
LOG_INFO("SIGNAL", "Stopping lektord");
@@ -1118,20 +1118,20 @@ __lkt_handle_INT(struct lkt_state *srv)
}
PRIVATE_FUNCTION EXIT_FUNCTION
-__lkt_handle_ILL(struct lkt_state UNUSED *srv)
+___lkt_handle_ILL(struct lkt_state UNUSED *srv)
{
LOG_ERROR("SIGNAL", "Handle the SIGILL, I will try to exit normally");
- __lkt_handle_INT(srv);
+ ___lkt_handle_INT(srv);
}
static void
-__lkt_handle_USR1(struct lkt_state UNUSED *srv)
+___lkt_handle_USR1(struct lkt_state UNUSED *srv)
{
LOG_INFO("SIGNAL", "Ignore signal SIGUSR1");
}
static void
-__lkt_handle_USR2(struct lkt_state UNUSED *srv)
+___lkt_handle_USR2(struct lkt_state UNUSED *srv)
{
LOG_INFO("SIGNAL", "Ignore signal SIGUSR2");
}
@@ -1139,23 +1139,23 @@ __lkt_handle_USR2(struct lkt_state UNUSED *srv)
static inline void
handle_signals(struct lkt_state *srv)
{
-#define __HANDLE(srv, signal) \
- if (__lkt_signal_##signal) { \
+#define ___HANDLE(srv, signal) \
+ if (___lkt_signal_##signal) { \
LOG_INFO("SIGNAL", "Server in handle phase for signal SIG" #signal); \
- if (srv->__signal_##signal) \
- srv->__signal_##signal(srv); \
+ if (srv->___signal_##signal) \
+ srv->___signal_##signal(srv); \
else \
LOG_WARN("SIGNAL", "No signal handler in server for SIG" #signal); \
} \
- __lkt_signal_##signal = 0;
+ ___lkt_signal_##signal = 0;
- __HANDLE(srv, INT)
- __HANDLE(srv, ILL)
- __HANDLE(srv, QUIT)
- __HANDLE(srv, USR1)
- __HANDLE(srv, USR2)
+ ___HANDLE(srv, INT)
+ ___HANDLE(srv, ILL)
+ ___HANDLE(srv, QUIT)
+ ___HANDLE(srv, USR1)
+ ___HANDLE(srv, USR2)
-#undef __HANDLE
+#undef ___HANDLE
}
/****************************
@@ -1176,16 +1176,16 @@ lkt_listen(struct lkt_state *srv)
srv->clients = LKT_ALLOC_STRUCT_ARRAY(lkt_client, srv->fds_max);
LOG_INFO("INIT", "Register signal handlers for signals...");
- srv->__signal_INT = __lkt_handle_INT;
- srv->__signal_QUIT = __lkt_handle_INT;
- srv->__signal_USR1 = __lkt_handle_USR1;
- srv->__signal_USR2 = __lkt_handle_USR2;
- srv->__signal_ILL = __lkt_handle_ILL;
- signal(SIGINT, __signal_handler);
- signal(SIGILL, __signal_handler);
- signal(SIGUSR1, __signal_handler);
- signal(SIGUSR2, __signal_handler);
- signal(SIGQUIT, __signal_handler);
+ srv->___signal_INT = ___lkt_handle_INT;
+ srv->___signal_QUIT = ___lkt_handle_INT;
+ srv->___signal_USR1 = ___lkt_handle_USR1;
+ srv->___signal_USR2 = ___lkt_handle_USR2;
+ srv->___signal_ILL = ___lkt_handle_ILL;
+ signal(SIGINT, ___signal_handler);
+ signal(SIGILL, ___signal_handler);
+ signal(SIGUSR1, ___signal_handler);
+ signal(SIGUSR2, ___signal_handler);
+ signal(SIGQUIT, ___signal_handler);
LOG_INFO("INIT", "Signal handlers registered");
int is_unix_socket = STR_NMATCH(srv->port, "unix", 4);
--
GitLab