Source-Changes-HG archive

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

[src/trunk]: src/usr.sbin/mountd make this compatible with bool.h. no functi...



details:   https://anonhg.NetBSD.org/src/rev/36d5bb9bf656
branches:  trunk
changeset: 748056:36d5bb9bf656
user:      pooka <pooka%NetBSD.org@localhost>
date:      Sun Oct 11 16:30:19 2009 +0000

description:
make this compatible with bool.h.  no functional change intended.

diffstat:

 usr.sbin/mountd/mountd.c |  28 ++++++++++++++--------------
 1 files changed, 14 insertions(+), 14 deletions(-)

diffs (108 lines):

diff -r 1c033fda8d22 -r 36d5bb9bf656 usr.sbin/mountd/mountd.c
--- a/usr.sbin/mountd/mountd.c  Sun Oct 11 16:20:22 2009 +0000
+++ b/usr.sbin/mountd/mountd.c  Sun Oct 11 16:30:19 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mountd.c,v 1.119 2009/04/17 13:56:33 lukem Exp $        */
+/*     $NetBSD: mountd.c,v 1.120 2009/10/11 16:30:19 pooka Exp $        */
 
 /*
  * Copyright (c) 1989, 1993
@@ -42,7 +42,7 @@
 #if 0
 static char     sccsid[] = "@(#)mountd.c  8.15 (Berkeley) 5/1/95";
 #else
-__RCSID("$NetBSD: mountd.c,v 1.119 2009/04/17 13:56:33 lukem Exp $");
+__RCSID("$NetBSD: mountd.c,v 1.120 2009/10/11 16:30:19 pooka Exp $");
 #endif
 #endif                         /* not lint */
 
@@ -709,13 +709,13 @@
        caddr_t cp;
 {
        struct mountlist *mlp;
-       int true = 1;
-       int false = 0;
+       int trueval = 1;
+       int falseval = 0;
        char *strp;
 
        mlp = mlhead;
        while (mlp) {
-               if (!xdr_bool(xdrsp, &true))
+               if (!xdr_bool(xdrsp, &trueval))
                        return (0);
                strp = &mlp->ml_host[0];
                if (!xdr_string(xdrsp, &strp, RPCMNT_NAMELEN))
@@ -725,7 +725,7 @@
                        return (0);
                mlp = mlp->ml_next;
        }
-       if (!xdr_bool(xdrsp, &false))
+       if (!xdr_bool(xdrsp, &falseval))
                return (0);
        return (1);
 }
@@ -739,7 +739,7 @@
        caddr_t cp;
 {
        struct exportlist *ep;
-       int false = 0;
+       int falseval = 0;
        int putdef;
        sigset_t sighup_mask;
 
@@ -757,7 +757,7 @@
                ep = ep->ex_next;
        }
        (void)sigprocmask(SIG_UNBLOCK, &sighup_mask, NULL);
-       if (!xdr_bool(xdrsp, &false))
+       if (!xdr_bool(xdrsp, &falseval))
                return (0);
        return (1);
 errout:
@@ -778,15 +778,15 @@
 {
        struct grouplist *grp;
        struct hostlist *hp;
-       int true = 1;
-       int false = 0;
+       int trueval = 1;
+       int falseval = 0;
        int gotalldir = 0;
        char *strp;
 
        if (dp) {
                if (put_exlist(dp->dp_left, xdrsp, adp, putdefp))
                        return (1);
-               if (!xdr_bool(xdrsp, &true))
+               if (!xdr_bool(xdrsp, &trueval))
                        return (1);
                strp = dp->dp_dirp;
                if (!xdr_string(xdrsp, &strp, RPCMNT_PATHLEN))
@@ -801,7 +801,7 @@
                        while (hp) {
                                grp = hp->ht_grp;
                                if (grp->gr_type == GT_HOST) {
-                                       if (!xdr_bool(xdrsp, &true))
+                                       if (!xdr_bool(xdrsp, &trueval))
                                                return (1);
                                        strp =
                                          grp->gr_ptr.gt_addrinfo->ai_canonname;
@@ -809,7 +809,7 @@
                                                        RPCMNT_NAMELEN))
                                                return (1);
                                } else if (grp->gr_type == GT_NET) {
-                                       if (!xdr_bool(xdrsp, &true))
+                                       if (!xdr_bool(xdrsp, &trueval))
                                                return (1);
                                        strp = grp->gr_ptr.gt_net.nt_name;
                                        if (!xdr_string(xdrsp, &strp,
@@ -823,7 +823,7 @@
                                }
                        }
                }
-               if (!xdr_bool(xdrsp, &false))
+               if (!xdr_bool(xdrsp, &falseval))
                        return (1);
                if (put_exlist(dp->dp_right, xdrsp, adp, putdefp))
                        return (1);



Home | Main Index | Thread Index | Old Index