Module Name: src
Committed By: rmind
Date: Wed Aug 31 22:43:19 UTC 2011
Modified Files:
src/sys/kern: kern_sig.c
Log Message:
sigispending: simplify a little.
To generate a diff of this commit:
cvs rdiff -u -r1.311 -r1.312 src/sys/kern/kern_sig.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/kern_sig.c
diff -u src/sys/kern/kern_sig.c:1.311 src/sys/kern/kern_sig.c:1.312
--- src/sys/kern/kern_sig.c:1.311 Wed Aug 31 16:05:44 2011
+++ src/sys/kern/kern_sig.c Wed Aug 31 22:43:19 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_sig.c,v 1.311 2011/08/31 16:05:44 christos Exp $ */
+/* $NetBSD: kern_sig.c,v 1.312 2011/08/31 22:43:19 rmind Exp $ */
/*-
* Copyright (c) 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -70,7 +70,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_sig.c,v 1.311 2011/08/31 16:05:44 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_sig.c,v 1.312 2011/08/31 22:43:19 rmind Exp $");
#include "opt_ptrace.h"
#include "opt_compat_sunos.h"
@@ -707,12 +707,9 @@
sigminusset(&l->l_sigmask, &tset);
if (signo == 0) {
- if ((signo = firstsig(&tset)) != 0)
- return signo;
- } else if (sigismember(&tset, signo))
- return signo;
-
- return 0;
+ return firstsig(&tset);
+ }
+ return sigismember(&tset, signo) ? signo : 0;
}
#ifdef KERN_SA
