Clean up the SIGINT handler.

[meshlink] / src / net.c

diff --git a/src/net.c b/src/net.c
index 1487e8182b7dd928b1a55bfd8d476fa584bc613e..794bb73f0e460f400d6d2dccf8eda89f63e97103 100644 (file)
--- a/src/net.c
+++ b/src/net.c
@@ -224,7 +224,7 @@ static void periodic_handler(void *data) {
 
                                if(!found) {
                                        logger(DEBUG_CONNECTIONS, LOG_INFO, "Autoconnecting to %s", n->name);
-                                       outgoing_t *outgoing = xmalloc_and_zero(sizeof *outgoing);
+                                       outgoing_t *outgoing = xzalloc(sizeof *outgoing);
                                        outgoing->name = xstrdup(n->name);
                                        list_insert_tail(outgoing_list, outgoing);
                                        setup_outgoing_connection(outgoing);
@@ -306,7 +306,7 @@ static void sigalrm_handler(void *data) {
 #endif
 
 int reload_configuration(void) {
-       char *fname;
+       char *fname = NULL;
 
        /* Reread our own configuration file */
 
@@ -454,9 +454,10 @@ int main_loop(void) {
 
 #ifndef HAVE_MINGW
        signal_del(&sighup);
-       signal_del(&sigalrm);
-       signal_del(&sigquit);
        signal_del(&sigterm);
+       signal_del(&sigquit);
+       signal_del(&sigint);
+       signal_del(&sigalrm);
 #endif
 
        timeout_del(&periodictimer);