[src/trunk]: src/sys/compat/netbsd32 Don't use private as a variable name sin...

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

details:   https://anonhg.NetBSD.org/src/rev/bf71d7bfe9c4
branches:  trunk
changeset: 332014:bf71d7bfe9c4
user:      matt <matt%NetBSD.org@localhost>
date:      Fri Sep 05 05:26:26 2014 +0000

description:
Don't use private as a variable name since it's reserved in C++

diffstat:

 sys/compat/netbsd32/netbsd32_compat_50.c |  12 ++++++------
 sys/compat/netbsd32/netbsd32_event.c     |  12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diffs (92 lines):

diff -r 28ec7907a28d -r bf71d7bfe9c4 sys/compat/netbsd32/netbsd32_compat_50.c
--- a/sys/compat/netbsd32/netbsd32_compat_50.c  Fri Sep 05 05:25:28 2014 +0000
+++ b/sys/compat/netbsd32/netbsd32_compat_50.c  Fri Sep 05 05:26:26 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: netbsd32_compat_50.c,v 1.25 2014/08/21 06:40:35 maxv Exp $     */
+/*     $NetBSD: netbsd32_compat_50.c,v 1.26 2014/09/05 05:26:26 matt Exp $     */
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_50.c,v 1.25 2014/08/21 06:40:35 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_50.c,v 1.26 2014/09/05 05:26:26 matt Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_sysv.h"
@@ -580,12 +580,12 @@
 }
 
 static int
-netbsd32_kevent_fetch_changes(void *private, const struct kevent *changelist,
+netbsd32_kevent_fetch_changes(void *ctx, const struct kevent *changelist,
     struct kevent *changes, size_t index, int n)
 {
        const struct netbsd32_kevent *src =
            (const struct netbsd32_kevent *)changelist;
-       struct netbsd32_kevent *kev32, *changes32 = private;
+       struct netbsd32_kevent *kev32, *changes32 = ctx;
        int error, i;
 
        error = copyin(src + index, changes32, n * sizeof(*changes32));
@@ -597,10 +597,10 @@
 }
 
 static int
-netbsd32_kevent_put_events(void *private, struct kevent *events,
+netbsd32_kevent_put_events(void *ctx, struct kevent *events,
     struct kevent *eventlist, size_t index, int n)
 {
-       struct netbsd32_kevent *kev32, *events32 = private;
+       struct netbsd32_kevent *kev32, *events32 = ctx;
        int i;
 
        for (i = 0, kev32 = events32; i < n; i++, kev32++, events++)
diff -r 28ec7907a28d -r bf71d7bfe9c4 sys/compat/netbsd32/netbsd32_event.c
--- a/sys/compat/netbsd32/netbsd32_event.c      Fri Sep 05 05:25:28 2014 +0000
+++ b/sys/compat/netbsd32/netbsd32_event.c      Fri Sep 05 05:26:26 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: netbsd32_event.c,v 1.11 2014/06/24 14:33:57 maxv Exp $ */
+/*     $NetBSD: netbsd32_event.c,v 1.12 2014/09/05 05:26:26 matt Exp $ */
 
 /*
  *  Copyright (c) 2005 The NetBSD Foundation.
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_event.c,v 1.11 2014/06/24 14:33:57 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_event.c,v 1.12 2014/09/05 05:26:26 matt Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -61,12 +61,12 @@
 }
 
 static int
-netbsd32_kevent_fetch_changes(void *private, const struct kevent *changelist,
+netbsd32_kevent_fetch_changes(void *ctx, const struct kevent *changelist,
     struct kevent *changes, size_t index, int n)
 {
        const struct netbsd32_kevent *src =
            (const struct netbsd32_kevent *)changelist;
-       struct netbsd32_kevent *kev32, *changes32 = private;
+       struct netbsd32_kevent *kev32, *changes32 = ctx;
        int error, i;
 
        error = copyin(src + index, changes32, n * sizeof(*changes32));
@@ -78,10 +78,10 @@
 }
 
 static int
-netbsd32_kevent_put_events(void *private, struct kevent *events,
+netbsd32_kevent_put_events(void *ctx, struct kevent *events,
     struct kevent *eventlist, size_t index, int n)
 {
-       struct netbsd32_kevent *kev32, *events32 = private;
+       struct netbsd32_kevent *kev32, *events32 = ctx;
        int i;
 
        for (i = 0, kev32 = events32; i < n; i++, kev32++, events++)