Changeset 1f68d5d

Timestamp:

Jun 1, 2021, 2:22:37 PM (3 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

bc179fd

Parents:

68ff3de

Message:

Changed signal handling to avoid incompatible pointer cast

File:

• src/main.cc (modified) (3 diffs)

src/main.cc

@@ -160 +160 @@
 #define SIGPARMS int sig __attribute__(( unused )), siginfo_t * sfp __attribute__(( unused )), ucontext_t * cxt __attribute__(( unused ))
 
-static void Signal( int sig, void (* handler)(SIGPARMS), int flags ) {
-        struct sigaction act;
-
-        act.sa_sigaction = (void (*)(int, siginfo_t *, void *))handler;
+static void _Signal(struct sigaction & act, int sig, int flags ) {
         act.sa_flags = flags;
 
@@ -170 +167 @@
             _exit( EXIT_FAILURE );
         } // if
+}
+
+static void Signal( int sig, void (* handler)(SIGPARMS), int flags ) {
+        struct sigaction act;
+        act.sa_sigaction = (void (*)(int, siginfo_t *, void *))handler;
+        _Signal(act, sig, flags);
+} // Signal
+
+static void Signal( int sig, void (* handler)(int), int flags ) {
+        struct sigaction act;
+        act.sa_handler = handler;
+        _Signal(act, sig, flags);
 } // Signal
 
@@ -202 +211 @@
 static void sigAbortHandler( SIGPARMS ) {
         backtrace( 6 );                                                                         // skip first 6 stack frames
-        Signal( SIGABRT, (void (*)(SIGPARMS))SIG_DFL, SA_SIGINFO );     // reset default signal handler
+        Signal( SIGABRT, SIG_DFL, SA_SIGINFO ); // reset default signal handler
         raise( SIGABRT );                                                                       // reraise SIGABRT
 } // sigAbortHandler