From a0ae03a7d3b3fa1d249b77dacc6db4e4c913d76d Mon Sep 17 00:00:00 2001 From: Sascha Wildner Date: Sat, 21 Apr 2012 22:59:58 +0200 Subject: [PATCH] kernel: Fix some whitespace from the previous commit. --- sys/kern/kern_exit.c | 4 +--- sys/kern/kern_sig.c | 12 ++++++------ sys/sys/proc.h | 2 +- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/sys/kern/kern_exit.c b/sys/kern/kern_exit.c index 2a24d9db4a..93189e6112 100644 --- a/sys/kern/kern_exit.c +++ b/sys/kern/kern_exit.c @@ -37,7 +37,6 @@ * * @(#)kern_exit.c 8.7 (Berkeley) 2/12/94 * $FreeBSD: src/sys/kern/kern_exit.c,v 1.92.2.11 2003/01/13 22:51:16 dillon Exp $ - * $DragonFly: src/sys/kern/kern_exit.c,v 1.91 2008/05/18 20:02:02 nth Exp $ */ #include "opt_compat.h" @@ -538,8 +537,7 @@ exit1(int rv) * flag set, or if the handler is set to SIG_IGN, notify process 1 * instead (and hope it will handle this situation). */ - if (p->p_pptr->p_sigacts->ps_flag & - (PS_NOCLDWAIT | PS_CLDSIGIGN)) { + if (p->p_pptr->p_sigacts->ps_flag & (PS_NOCLDWAIT | PS_CLDSIGIGN)) { struct proc *pp = p->p_pptr; PHOLD(pp); diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c index fd905cd9c7..042dfdd63b 100644 --- a/sys/kern/kern_sig.c +++ b/sys/kern/kern_sig.c @@ -321,10 +321,10 @@ kern_sigaction(int sig, struct sigaction *act, struct sigaction *oact) } else { p->p_sigacts->ps_flag &= ~PS_NOCLDWAIT; } - if (ps->ps_sigact[_SIG_IDX(SIGCHLD)] == SIG_IGN) - ps->ps_flag |= PS_CLDSIGIGN; - else - ps->ps_flag &= ~PS_CLDSIGIGN; + if (ps->ps_sigact[_SIG_IDX(SIGCHLD)] == SIG_IGN) + ps->ps_flag |= PS_CLDSIGIGN; + else + ps->ps_flag &= ~PS_CLDSIGIGN; } /* * Set bit in p_sigignore for signals that are set to SIG_IGN, @@ -438,8 +438,8 @@ execsigs(struct proc *p) * Reset no zombies if child dies flag as Solaris does. */ p->p_sigacts->ps_flag &= ~(PS_NOCLDWAIT | PS_CLDSIGIGN); - if (ps->ps_sigact[_SIG_IDX(SIGCHLD)] == SIG_IGN) - ps->ps_sigact[_SIG_IDX(SIGCHLD)] = SIG_DFL; + if (ps->ps_sigact[_SIG_IDX(SIGCHLD)] == SIG_IGN) + ps->ps_sigact[_SIG_IDX(SIGCHLD)] = SIG_DFL; } /* diff --git a/sys/sys/proc.h b/sys/sys/proc.h index 2220707e84..86f95226c7 100644 --- a/sys/sys/proc.h +++ b/sys/sys/proc.h @@ -112,7 +112,7 @@ struct pgrp { #define PS_NOCLDWAIT 0x0001 /* No zombies if child dies */ #define PS_NOCLDSTOP 0x0002 /* No SIGCHLD when children stop. */ -#define PS_CLDSIGIGN 0x0004 /* The SIGCHLD handler is SIG_IGN. */ +#define PS_CLDSIGIGN 0x0004 /* The SIGCHLD handler is SIG_IGN. */ /* * pargs, used to hold a copy of the command line, if it had a sane -- 2.41.0