diff options
| author | Todd T. Fries <todd@cvs.openbsd.org> | 2002-11-08 23:18:26 +0000 |
|---|---|---|
| committer | Todd T. Fries <todd@cvs.openbsd.org> | 2002-11-08 23:18:26 +0000 |
| commit | 330cdd99542e98d1169f6ca3f33edab8e8640482 (patch) | |
| tree | db81758efa5c2f4266e14fa855ab7539baea5443 | |
| parent | c8df46d073f7dcd49e1ef769672cf6842c657139 (diff) | |
kill two compiler warnings; ok marc@
| -rw-r--r-- | lib/libc_r/uthread/uthread_sig.c | 10 | ||||
| -rw-r--r-- | lib/libpthread/uthread/uthread_sig.c | 10 |
2 files changed, 12 insertions, 8 deletions
diff --git a/lib/libc_r/uthread/uthread_sig.c b/lib/libc_r/uthread/uthread_sig.c index c3b6f435e5a..1d64e077cde 100644 --- a/lib/libc_r/uthread/uthread_sig.c +++ b/lib/libc_r/uthread/uthread_sig.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uthread_sig.c,v 1.15 2002/11/02 23:52:46 millert Exp $ */ +/* $OpenBSD: uthread_sig.c,v 1.16 2002/11/08 23:18:25 todd Exp $ */ /* * Copyright (c) 1995-1998 John Birrell <jb@cimlogic.com.au> * All rights reserved. @@ -111,15 +111,15 @@ _thread_sig_handler(int sig, siginfo_t *info, struct sigcontext * scp) _sched_ticks++; /* only process signal when scheduler isn't running */ - if (_thread_kern_in_sched == 0) - if (curthread->sig_defer_count > 0) + if (_thread_kern_in_sched == 0) { + if (curthread->sig_defer_count > 0) { /* * The scheduler interrupt has come when * the currently running thread has deferred * thread signals. */ curthread->yield_on_sig_undefer = 1; - else { + } else { /* Schedule the next thread. */ _thread_kern_sched(scp); @@ -137,6 +137,7 @@ _thread_sig_handler(int sig, siginfo_t *info, struct sigcontext * scp) */ return; } + } } else if ((_queue_signals != 0) || ((_thread_kern_in_sched == 0) && (curthread->sig_defer_count > 0))) { @@ -318,6 +319,7 @@ _thread_signal(pthread_t pthread, int sig) case PS_SUSPENDED: case PS_SPINBLOCK: case PS_DEADLOCK: + case PS_STATE_MAX: /* only here to quell a compiler warning */ /* Nothing to do here. */ break; diff --git a/lib/libpthread/uthread/uthread_sig.c b/lib/libpthread/uthread/uthread_sig.c index c3b6f435e5a..1d64e077cde 100644 --- a/lib/libpthread/uthread/uthread_sig.c +++ b/lib/libpthread/uthread/uthread_sig.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uthread_sig.c,v 1.15 2002/11/02 23:52:46 millert Exp $ */ +/* $OpenBSD: uthread_sig.c,v 1.16 2002/11/08 23:18:25 todd Exp $ */ /* * Copyright (c) 1995-1998 John Birrell <jb@cimlogic.com.au> * All rights reserved. @@ -111,15 +111,15 @@ _thread_sig_handler(int sig, siginfo_t *info, struct sigcontext * scp) _sched_ticks++; /* only process signal when scheduler isn't running */ - if (_thread_kern_in_sched == 0) - if (curthread->sig_defer_count > 0) + if (_thread_kern_in_sched == 0) { + if (curthread->sig_defer_count > 0) { /* * The scheduler interrupt has come when * the currently running thread has deferred * thread signals. */ curthread->yield_on_sig_undefer = 1; - else { + } else { /* Schedule the next thread. */ _thread_kern_sched(scp); @@ -137,6 +137,7 @@ _thread_sig_handler(int sig, siginfo_t *info, struct sigcontext * scp) */ return; } + } } else if ((_queue_signals != 0) || ((_thread_kern_in_sched == 0) && (curthread->sig_defer_count > 0))) { @@ -318,6 +319,7 @@ _thread_signal(pthread_t pthread, int sig) case PS_SUSPENDED: case PS_SPINBLOCK: case PS_DEADLOCK: + case PS_STATE_MAX: /* only here to quell a compiler warning */ /* Nothing to do here. */ break; |