Commit fdd57348 authored by Nick Mathewson's avatar Nick Mathewson 🦀
Browse files

Remove the unused is_parent==0 option from handle_signals.

parent a61c36d5

src/or/main.c

+19 −37
Original line number Diff line number Diff line
@@ -2530,7 +2530,7 @@ do_main_loop(void) 
    }

  }



  handle_signals(1);

  handle_signals();

  monotime_init();

  timers_initialize();
@@ -3052,12 +3052,11 @@ static struct { 
  { -1, -1, NULL }

};



/** Set up the signal handlers for either parent or child process */

/** Set up the signal handlers for this process. */

void

handle_signals(int is_parent)

handle_signals(void)

{

  int i;

  if (is_parent) {

  for (i = 0; signal_handlers[i].signal_value >= 0; ++i) {

    if (signal_handlers[i].try_to_register) {

      signal_handlers[i].signal_event =
@@ -3076,23 +3075,6 @@ handle_signals(int is_parent) 
                      &signal_handlers[i].signal_value);

    }

  }

  } else {

#ifndef _WIN32

    struct sigaction action;

    action.sa_flags = 0;

    sigemptyset(&action.sa_mask);

    action.sa_handler = SIG_IGN;

    sigaction(SIGINT,  &action, NULL);

    sigaction(SIGTERM, &action, NULL);

    sigaction(SIGPIPE, &action, NULL);

    sigaction(SIGUSR1, &action, NULL);

    sigaction(SIGUSR2, &action, NULL);

    sigaction(SIGHUP,  &action, NULL);

#ifdef SIGXFSZ

    sigaction(SIGXFSZ, &action, NULL);

#endif

#endif /* !defined(_WIN32) */

  }

}



/* Make sure the signal handler for signal_num will be called. */

src/or/main.h

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ MOCK_DECL(long,get_uptime,(void)); 


unsigned get_signewnym_epoch(void);



void handle_signals(int is_parent);

void handle_signals(void);

void activate_signal(int signal_num);



int try_locking(const or_options_t *options, int err_if_locked);