summary refs log tree commit diff
path: root/src/trap.c
diff options
context:
space:
mode:
authorDenys Vlasenko <dvlasenk@redhat.com>2016-10-26 19:28:29 +0200
committerHerbert Xu <herbert@gondor.apana.org.au>2018-03-10 15:59:26 +0800
commit53dab360a1e0dddcfd83c6cbfc9f720f5e233550 (patch)
treee9dc884e38188876ac95450fbb2832026dcdfd70 /src/trap.c
parentRelease 0.5.9.1. (diff)
downloaddash-53dab360a1e0dddcfd83c6cbfc9f720f5e233550.tar.gz
dash-53dab360a1e0dddcfd83c6cbfc9f720f5e233550.zip
trap: Globally rename pendingsigs to pending_sig
This variable does not contain "sigs" (plural).
It contains either 0 or (one) signal number of a pending signal.

For someone unfamiliar with this code, "pendingsigs" name is confusing -
it hints at being an array or bit mask of pending singnals.

Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
CC: dash@vger.kernel.org
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'src/trap.c')
-rw-r--r--src/trap.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/trap.c b/src/trap.c
index edb9938..69eb8ab 100644
--- a/src/trap.c
+++ b/src/trap.c
@@ -73,7 +73,7 @@ char sigmode[NSIG - 1];
 /* indicates specified signal received */
 static char gotsig[NSIG - 1];
 /* last pending signal */
-volatile sig_atomic_t pendingsigs;
+volatile sig_atomic_t pending_sig;
 /* received SIGCHLD */
 int gotsigchld;
 
@@ -291,7 +291,7 @@ onsig(int signo)
 	}
 
 	gotsig[signo - 1] = 1;
-	pendingsigs = signo;
+	pending_sig = signo;
 
 	if (signo == SIGINT && !trap[SIGINT]) {
 		if (!suppressint)
@@ -314,7 +314,7 @@ void dotrap(void)
 	int i;
 	int status, last_status;
 
-	if (!pendingsigs)
+	if (!pending_sig)
 		return;
 
 	status = savestatus;
@@ -323,7 +323,7 @@ void dotrap(void)
 		status = exitstatus;
 		savestatus = status;
 	}
-	pendingsigs = 0;
+	pending_sig = 0;
 	barrier();
 
 	for (i = 0, q = gotsig; i < NSIG - 1; i++, q++) {
@@ -331,7 +331,7 @@ void dotrap(void)
 			continue;
 
 		if (evalskip) {
-			pendingsigs = i + 1;
+			pending_sig = i + 1;
 			break;
 		}