Module Name: src
Committed By: pooka
Date: Tue Oct 13 22:04:31 UTC 2009
Modified Files:
src/dist/smbfs/include: smb_kernelops.h
src/dist/smbfs/lib/smb: smb_kernelops.c
src/sbin/cgdconfig: cgd_kernelops.c cgd_kernelops.h
src/sbin/fsck_lfs: kernelops.c kernelops.h
Log Message:
fix prototypes of function pointers to varargs syscalls
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/dist/smbfs/include/smb_kernelops.h
cvs rdiff -u -r1.1 -r1.2 src/dist/smbfs/lib/smb/smb_kernelops.c
cvs rdiff -u -r1.1 -r1.2 src/sbin/cgdconfig/cgd_kernelops.c
cvs rdiff -u -r1.2 -r1.3 src/sbin/cgdconfig/cgd_kernelops.h
cvs rdiff -u -r1.2 -r1.3 src/sbin/fsck_lfs/kernelops.c \
src/sbin/fsck_lfs/kernelops.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/dist/smbfs/include/smb_kernelops.h
diff -u src/dist/smbfs/include/smb_kernelops.h:1.1 src/dist/smbfs/include/smb_kernelops.h:1.2
--- src/dist/smbfs/include/smb_kernelops.h:1.1 Sun Sep 6 18:38:17 2009
+++ src/dist/smbfs/include/smb_kernelops.h Tue Oct 13 22:04:31 2009
@@ -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);
Index: src/dist/smbfs/lib/smb/smb_kernelops.c
diff -u src/dist/smbfs/lib/smb/smb_kernelops.c:1.1 src/dist/smbfs/lib/smb/smb_kernelops.c:1.2
--- src/dist/smbfs/lib/smb/smb_kernelops.c:1.1 Sun Sep 6 18:38:17 2009
+++ src/dist/smbfs/lib/smb/smb_kernelops.c Tue Oct 13 22:04:31 2009
@@ -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 @@
#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,
Index: src/sbin/cgdconfig/cgd_kernelops.c
diff -u src/sbin/cgdconfig/cgd_kernelops.c:1.1 src/sbin/cgdconfig/cgd_kernelops.c:1.2
--- src/sbin/cgdconfig/cgd_kernelops.c:1.1 Tue Sep 8 21:36:35 2009
+++ src/sbin/cgdconfig/cgd_kernelops.c Tue Oct 13 22:04:31 2009
@@ -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 @@
#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,
};
Index: src/sbin/cgdconfig/cgd_kernelops.h
diff -u src/sbin/cgdconfig/cgd_kernelops.h:1.2 src/sbin/cgdconfig/cgd_kernelops.h:1.3
--- src/sbin/cgdconfig/cgd_kernelops.h:1.2 Thu Sep 10 09:10:29 2009
+++ src/sbin/cgdconfig/cgd_kernelops.h Tue Oct 13 22:04:31 2009
@@ -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);
};
Index: src/sbin/fsck_lfs/kernelops.c
diff -u src/sbin/fsck_lfs/kernelops.c:1.2 src/sbin/fsck_lfs/kernelops.c:1.3
--- src/sbin/fsck_lfs/kernelops.c:1.2 Thu Aug 6 00:55:08 2009
+++ src/sbin/fsck_lfs/kernelops.c Tue Oct 13 22:04:31 2009
@@ -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 @@
#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,
Index: src/sbin/fsck_lfs/kernelops.h
diff -u src/sbin/fsck_lfs/kernelops.h:1.2 src/sbin/fsck_lfs/kernelops.h:1.3
--- src/sbin/fsck_lfs/kernelops.h:1.2 Thu Aug 6 00:55:08 2009
+++ src/sbin/fsck_lfs/kernelops.h Tue Oct 13 22:04:31 2009
@@ -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);
