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

[matt <matt%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/a01fb6456029
branches:  trunk
changeset: 332024:a01fb6456029
user:      matt <matt%NetBSD.org@localhost>
date:      Fri Sep 05 05:34:57 2014 +0000

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

diffstat:

 sys/nfs/nfs_bio.c        |  22 +++++++++++-----------
 sys/nfs/nfs_clntsocket.c |  14 +++++++-------
 sys/nfs/nfs_socket.c     |  14 +++++++-------
 3 files changed, 25 insertions(+), 25 deletions(-)

diffs (187 lines):

diff -r b0f0cc6be2e3 -r a01fb6456029 sys/nfs/nfs_bio.c
--- a/sys/nfs/nfs_bio.c Fri Sep 05 05:34:41 2014 +0000
+++ b/sys/nfs/nfs_bio.c Fri Sep 05 05:34:57 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nfs_bio.c,v 1.189 2013/08/12 17:46:38 hannken Exp $    */
+/*     $NetBSD: nfs_bio.c,v 1.190 2014/09/05 05:34:57 matt Exp $       */
 
 /*
  * Copyright (c) 1989, 1993
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nfs_bio.c,v 1.189 2013/08/12 17:46:38 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nfs_bio.c,v 1.190 2014/09/05 05:34:57 matt Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_nfs.h"
@@ -615,15 +615,15 @@
        struct nfsnode *np = VTONFS(vp);
        struct nfsmount *nmp = VFSTONFS(vp->v_mount);
        int error = 0, allerror = 0, slptimeo;
-       bool catch;
+       bool catch_p;
 
        if ((nmp->nm_flag & NFSMNT_INT) == 0)
                intrflg = 0;
        if (intrflg) {
-               catch = true;
+               catch_p = true;
                slptimeo = 2 * hz;
        } else {
-               catch = false;
+               catch_p = false;
                slptimeo = 0;
        }
        /*
@@ -645,7 +645,7 @@
         */
        np->n_flag |= NFLUSHINPROG;
        mutex_exit(vp->v_interlock);
-       error = vinvalbuf(vp, flags, cred, l, catch, 0);
+       error = vinvalbuf(vp, flags, cred, l, catch_p, 0);
        while (error) {
                if (allerror == 0)
                        allerror = error;
@@ -737,7 +737,7 @@
        struct nfs_iod *iod;
        struct nfsmount *nmp;
        int slptimeo = 0, error;
-       bool catch = false;
+       bool catch_p = false;
 
        if (nfs_numasync == 0)
                return (EIO);
@@ -745,7 +745,7 @@
        nmp = VFSTONFS(bp->b_vp->v_mount);
 again:
        if (nmp->nm_flag & NFSMNT_INT)
-               catch = true;
+               catch_p = true;
 
        /*
         * Find a free iod to process this request.
@@ -796,7 +796,7 @@
                if (curlwp == uvm.pagedaemon_lwp) {
                        /* Enque for later, to avoid free-page deadlock */
                } else while (nmp->nm_bufqlen >= 2 * nmp->nm_bufqiods) {
-                       if (catch) {
+                       if (catch_p) {
                                error = cv_timedwait_sig(&nmp->nm_aiocv,
                                    &nmp->nm_lock, slptimeo);
                        } else {
@@ -808,8 +808,8 @@
                                        mutex_exit(&nmp->nm_lock);
                                        return (EINTR);
                                }
-                               if (catch) {
-                                       catch = false;
+                               if (catch_p) {
+                                       catch_p = false;
                                        slptimeo = 2 * hz;
                                }
                        }
diff -r b0f0cc6be2e3 -r a01fb6456029 sys/nfs/nfs_clntsocket.c
--- a/sys/nfs/nfs_clntsocket.c  Fri Sep 05 05:34:41 2014 +0000
+++ b/sys/nfs/nfs_clntsocket.c  Fri Sep 05 05:34:57 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nfs_clntsocket.c,v 1.1 2010/03/02 23:19:09 pooka Exp $ */
+/*     $NetBSD: nfs_clntsocket.c,v 1.2 2014/09/05 05:34:57 matt Exp $  */
 
 /*
  * Copyright (c) 1989, 1991, 1993, 1995
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nfs_clntsocket.c,v 1.1 2010/03/02 23:19:09 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nfs_clntsocket.c,v 1.2 2014/09/05 05:34:57 matt Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_nfs.h"
@@ -964,13 +964,13 @@
 {
        struct lwp *l;
        int timeo = 0;
-       bool catch = false;
+       bool catch_p = false;
        int error = 0;
 
        if (rep) {
                l = rep->r_lwp;
                if (rep->r_nmp->nm_flag & NFSMNT_INT)
-                       catch = true;
+                       catch_p = true;
        } else
                l = NULL;
        mutex_enter(&nmp->nm_lock);
@@ -979,13 +979,13 @@
                        error = EINTR;
                        goto quit;
                }
-               if (catch) {
+               if (catch_p) {
                        cv_timedwait_sig(&nmp->nm_sndcv, &nmp->nm_lock, timeo);
                } else {
                        cv_timedwait(&nmp->nm_sndcv, &nmp->nm_lock, timeo);
                }
-               if (catch) {
-                       catch = false;
+               if (catch_p) {
+                       catch_p = false;
                        timeo = 2 * hz;
                }
        }
diff -r b0f0cc6be2e3 -r a01fb6456029 sys/nfs/nfs_socket.c
--- a/sys/nfs/nfs_socket.c      Fri Sep 05 05:34:41 2014 +0000
+++ b/sys/nfs/nfs_socket.c      Fri Sep 05 05:34:57 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nfs_socket.c,v 1.192 2014/08/05 07:55:32 rtr Exp $     */
+/*     $NetBSD: nfs_socket.c,v 1.193 2014/09/05 05:34:57 matt Exp $    */
 
 /*
  * Copyright (c) 1989, 1991, 1993, 1995
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nfs_socket.c,v 1.192 2014/08/05 07:55:32 rtr Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nfs_socket.c,v 1.193 2014/09/05 05:34:57 matt Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_nfs.h"
@@ -889,12 +889,12 @@
 {
        int *flagp = &nmp->nm_iflag;
        int slptimeo = 0;
-       bool catch;
+       bool catch_p;
        int error = 0;
 
        KASSERT(nmp == rep->r_nmp);
 
-       catch = (nmp->nm_flag & NFSMNT_INT) != 0;
+       catch_p = (nmp->nm_flag & NFSMNT_INT) != 0;
        mutex_enter(&nmp->nm_lock);
        while (/* CONSTCOND */ true) {
                if (*flagp & NFSMNT_DISMNT) {
@@ -921,15 +921,15 @@
                        *flagp |= NFSMNT_RCVLOCK;
                        break;
                }
-               if (catch) {
+               if (catch_p) {
                        cv_timedwait_sig(&nmp->nm_rcvcv, &nmp->nm_lock,
                            slptimeo);
                } else {
                        cv_timedwait(&nmp->nm_rcvcv, &nmp->nm_lock,
                            slptimeo);
                }
-               if (catch) {
-                       catch = false;
+               if (catch_p) {
+                       catch_p = false;
                        slptimeo = 2 * hz;
                }
        }