Module Name: src
Committed By: matt
Date: Fri Sep 5 05:26:26 UTC 2014
Modified Files:
src/sys/compat/netbsd32: netbsd32_compat_50.c netbsd32_event.c
Log Message:
Don't use private as a variable name since it's reserved in C++
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sys/compat/netbsd32/netbsd32_compat_50.c
cvs rdiff -u -r1.11 -r1.12 src/sys/compat/netbsd32/netbsd32_event.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/netbsd32/netbsd32_compat_50.c
diff -u src/sys/compat/netbsd32/netbsd32_compat_50.c:1.25 src/sys/compat/netbsd32/netbsd32_compat_50.c:1.26
--- src/sys/compat/netbsd32/netbsd32_compat_50.c:1.25 Thu Aug 21 06:40:35 2014
+++ src/sys/compat/netbsd32/netbsd32_compat_50.c Fri Sep 5 05:26:26 2014
@@ -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 @@ netbsd32_kevent_fetch_timeout(const void
}
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 @@ netbsd32_kevent_fetch_changes(void *priv
}
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++)
Index: src/sys/compat/netbsd32/netbsd32_event.c
diff -u src/sys/compat/netbsd32/netbsd32_event.c:1.11 src/sys/compat/netbsd32/netbsd32_event.c:1.12
--- src/sys/compat/netbsd32/netbsd32_event.c:1.11 Tue Jun 24 14:33:57 2014
+++ src/sys/compat/netbsd32/netbsd32_event.c Fri Sep 5 05:26:26 2014
@@ -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 @@ netbsd32_kevent_fetch_timeout(const void
}
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 @@ netbsd32_kevent_fetch_changes(void *priv
}
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++)
