From 4be222467f58f9ef41e95102369f0d670e19feeb Mon Sep 17 00:00:00 2001
From: pooka <pooka@NetBSD.org>
Date: Tue, 13 Oct 2009 22:04:31 +0000
Subject: [PATCH] fix prototypes of function pointers to varargs syscalls

---
 dist/smbfs/include/smb_kernelops.h | 6 +++---
 dist/smbfs/lib/smb/smb_kernelops.c | 8 ++++----
 sbin/cgdconfig/cgd_kernelops.c     | 8 ++++----
 sbin/cgdconfig/cgd_kernelops.h     | 6 +++---
 sbin/fsck_lfs/kernelops.c          | 8 ++++----
 sbin/fsck_lfs/kernelops.h          | 4 ++--
 6 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/dist/smbfs/include/smb_kernelops.h b/dist/smbfs/include/smb_kernelops.h
index 7f6d4674fc49..6fd20b6f3dda 100644
--- a/dist/smbfs/include/smb_kernelops.h
+++ b/dist/smbfs/include/smb_kernelops.h
@@ -1,4 +1,4 @@
-/*      $NetBSD: smb_kernelops.h,v 1.1 2009/09/06 18:38:17 pooka Exp $        */
+/*      $NetBSD: smb_kernelops.h,v 1.2 2009/10/13 22:04:31 pooka Exp $        */
 
 /*
  * Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -35,8 +35,8 @@
 #include <fcntl.h>
 
 struct smb_kernelops {
-	int (*ko_open)(const char *, int, mode_t);
-	int (*ko_ioctl)(int, unsigned long, void *);
+	int (*ko_open)(const char *, int, ...);
+	int (*ko_ioctl)(int, unsigned long, ...);
 	int (*ko_close)(int);
 
 	int (*ko_socket)(int, int, int);
diff --git a/dist/smbfs/lib/smb/smb_kernelops.c b/dist/smbfs/lib/smb/smb_kernelops.c
index c7d9376b8a7e..69fc6e10199f 100644
--- a/dist/smbfs/lib/smb/smb_kernelops.c
+++ b/dist/smbfs/lib/smb/smb_kernelops.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: smb_kernelops.c,v 1.1 2009/09/06 18:38:17 pooka Exp $	*/
+/*	$NetBSD: smb_kernelops.c,v 1.2 2009/10/13 22:04:31 pooka Exp $	*/
 
 /*
  * Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -28,7 +28,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: smb_kernelops.c,v 1.1 2009/09/06 18:38:17 pooka Exp $");
+__RCSID("$NetBSD: smb_kernelops.c,v 1.2 2009/10/13 22:04:31 pooka Exp $");
 #endif /* !lint */
 
 #include <sys/types.h>
@@ -41,8 +41,8 @@ __RCSID("$NetBSD: smb_kernelops.c,v 1.1 2009/09/06 18:38:17 pooka Exp $");
 #include "smb_kernelops.h"
 
 const struct smb_kernelops smb_kops = {
-	.ko_open = (void *)open, /* XXX: rump_syscalls prototype */
-	.ko_ioctl = (void *)ioctl,
+	.ko_open = open,
+	.ko_ioctl = ioctl,
 	.ko_close = close,
 
 	.ko_socket = socket,
diff --git a/sbin/cgdconfig/cgd_kernelops.c b/sbin/cgdconfig/cgd_kernelops.c
index 9312fb86db9e..b21984802183 100644
--- a/sbin/cgdconfig/cgd_kernelops.c
+++ b/sbin/cgdconfig/cgd_kernelops.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: cgd_kernelops.c,v 1.1 2009/09/08 21:36:35 pooka Exp $	*/
+/*	$NetBSD: cgd_kernelops.c,v 1.2 2009/10/13 22:04:31 pooka Exp $	*/
 
 /*
  * Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -28,7 +28,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: cgd_kernelops.c,v 1.1 2009/09/08 21:36:35 pooka Exp $");
+__RCSID("$NetBSD: cgd_kernelops.c,v 1.2 2009/10/13 22:04:31 pooka Exp $");
 #endif /* !lint */
 
 #include <sys/types.h>
@@ -40,8 +40,8 @@ __RCSID("$NetBSD: cgd_kernelops.c,v 1.1 2009/09/08 21:36:35 pooka Exp $");
 #include "cgd_kernelops.h"
 
 const struct cgd_kernelops cgd_kops = {
-	.ko_open = (void *)open, /* XXX: rump_syscalls prototype */
-	.ko_ioctl = (void *)ioctl,
+	.ko_open = open,
+	.ko_ioctl = ioctl,
 	.ko_pread = pread,
 	.ko_close = close,
 };
diff --git a/sbin/cgdconfig/cgd_kernelops.h b/sbin/cgdconfig/cgd_kernelops.h
index 5827ddb122c6..8deb961af20f 100644
--- a/sbin/cgdconfig/cgd_kernelops.h
+++ b/sbin/cgdconfig/cgd_kernelops.h
@@ -1,4 +1,4 @@
-/*      $NetBSD: cgd_kernelops.h,v 1.2 2009/09/10 09:10:29 pooka Exp $	*/
+/*      $NetBSD: cgd_kernelops.h,v 1.3 2009/10/13 22:04:31 pooka Exp $	*/
 
 /*
  * Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -35,8 +35,8 @@
 #include <fcntl.h>
 
 struct cgd_kernelops {
-	int (*ko_open)(const char *, int, mode_t);
-	int (*ko_ioctl)(int, unsigned long, void *);
+	int (*ko_open)(const char *, int, ...);
+	int (*ko_ioctl)(int, unsigned long, ...);
 	int (*ko_close)(int);
 	ssize_t (*ko_pread)(int, void *, size_t, off_t);
 };
diff --git a/sbin/fsck_lfs/kernelops.c b/sbin/fsck_lfs/kernelops.c
index 7f72236e0b68..53e09557f2d0 100644
--- a/sbin/fsck_lfs/kernelops.c
+++ b/sbin/fsck_lfs/kernelops.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: kernelops.c,v 1.2 2009/08/06 00:55:08 pooka Exp $	*/
+/*	$NetBSD: kernelops.c,v 1.3 2009/10/13 22:04:31 pooka Exp $	*/
 
 /*
  * Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -28,7 +28,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: kernelops.c,v 1.2 2009/08/06 00:55:08 pooka Exp $");
+__RCSID("$NetBSD: kernelops.c,v 1.3 2009/10/13 22:04:31 pooka Exp $");
 #endif /* !lint */
 
 /*
@@ -68,8 +68,8 @@ const struct kernelops kops = {
 #else
 
 const struct kernelops kops = {
-	.ko_open = (void *)open, /* XXX: fix rump_syscalls */
-	.ko_fcntl = (void *)fcntl,
+	.ko_open = open,
+	.ko_fcntl = fcntl,
 	.ko_statvfs = statvfs1,
 	.ko_fhopen = fhopen,
 	.ko_close = close,
diff --git a/sbin/fsck_lfs/kernelops.h b/sbin/fsck_lfs/kernelops.h
index ac94ee73c5fe..781feb500b81 100644
--- a/sbin/fsck_lfs/kernelops.h
+++ b/sbin/fsck_lfs/kernelops.h
@@ -8,9 +8,9 @@
 #include <unistd.h>
 
 struct kernelops {
-	int (*ko_open)(const char *, int, mode_t);
+	int (*ko_open)(const char *, int, ...);
 	int (*ko_statvfs)(const char *, struct statvfs *, int);
-	int (*ko_fcntl)(int, int, void *);
+	int (*ko_fcntl)(int, int, ...);
 	int (*ko_fhopen)(const void *, size_t, int);
 	int (*ko_close)(int);