From 095889d33710e0f9d4d142f49b3089f1156194db Mon Sep 17 00:00:00 2001
From: Moe Jette <jette1@llnl.gov>
Date: Mon, 29 Nov 2010 20:05:14 +0000
Subject: [PATCH] convert repeated logic into a single loop
---
src/slurmctld/controller.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/src/slurmctld/controller.c b/src/slurmctld/controller.c
index 4f621ce4e1b..a583bf3f2ec 100644
--- a/src/slurmctld/controller.c
+++ b/src/slurmctld/controller.c
@@ -785,7 +785,7 @@ static int _reconfigure_slurm(void)
static void *_slurmctld_signal_hand(void *no_data)
{
int sig;
- int rc;
+ int i, rc;
int sig_array[] = {SIGINT, SIGTERM, SIGHUP, SIGABRT, 0};
sigset_t set;
/* Locks: Read configuration */
@@ -804,11 +804,8 @@ static void *_slurmctld_signal_hand(void *no_data)
unlock_slurmctld(config_read_lock);
/* Make sure no required signals are ignored (possibly inherited) */
- _default_sigaction(SIGINT);
- _default_sigaction(SIGTERM);
- _default_sigaction(SIGHUP);
- _default_sigaction(SIGABRT);
-
+ for (i = 0; sig_array[i]; i++)
+ _default_sigaction(sig_array[i]);
while (1) {
xsignal_sigset_create(sig_array, &set);
rc = sigwait(&set, &sig);
--
GitLab