Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/kern Don't use catch as a varible name.



details:   https://anonhg.NetBSD.org/src/rev/b65124a8b899
branches:  trunk
changeset: 802164:b65124a8b899
user:      matt <matt%NetBSD.org@localhost>
date:      Fri Sep 05 05:33:39 2014 +0000

description:
Don't use catch as a varible name.

diffstat:

 sys/kern/tty.c |  12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diffs (47 lines):

diff -r f50260d94c5c -r b65124a8b899 sys/kern/tty.c
--- a/sys/kern/tty.c    Fri Sep 05 05:33:06 2014 +0000
+++ b/sys/kern/tty.c    Fri Sep 05 05:33:39 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: tty.c,v 1.261 2014/05/22 16:31:19 dholland Exp $       */
+/*     $NetBSD: tty.c,v 1.262 2014/09/05 05:33:39 matt Exp $   */
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -63,7 +63,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tty.c,v 1.261 2014/05/22 16:31:19 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tty.c,v 1.262 2014/09/05 05:33:39 matt Exp $");
 
 #include "opt_compat_netbsd.h"
 
@@ -2669,7 +2669,7 @@
  * Must be called with the tty lock held.
  */
 int
-ttysleep(struct tty *tp, kcondvar_t *cv, bool catch, int timo)
+ttysleep(struct tty *tp, kcondvar_t *cv, bool catch_p, int timo)
 {
        int     error;
        short   gen;
@@ -2678,8 +2678,8 @@
 
        gen = tp->t_gen;
        if (cv == NULL)
-               error = kpause("ttypause", catch, timo, &tty_lock);
-       else if (catch)
+               error = kpause("ttypause", catch_p, timo, &tty_lock);
+       else if (catch_p)
                error = cv_timedwait_sig(cv, &tty_lock, timo);
        else
                error = cv_timedwait(cv, &tty_lock, timo);
@@ -2917,7 +2917,7 @@
        mutex_spin_enter(&tty_lock);
        while ((tp = TAILQ_FIRST(&tty_sigqueue)) != NULL) {
                KASSERT(tp->t_sigcount > 0);
-               for (st = 0; st < TTYSIG_COUNT; st++) {
+               for (st = TTYSIG_PG1; st < TTYSIG_COUNT; st++) {
                        if ((sig = firstsig(&tp->t_sigs[st])) != 0)
                                break;
                }



Home | Main Index | Thread Index | Old Index