Module Name: src
Committed By: sborrill
Date: Wed Oct 14 09:13:54 UTC 2009
Modified Files:
src/include [netbsd-5]: util.h
src/lib/libutil [netbsd-5]: opendisk.c
Log Message:
Pull up the following revisions(s) (requested by pooka in ticket #1089):
include/util.h: revision 1.53
lib/libutil/opendisk.c: revision 1.12
Fix the open routine function pointer prototype of opendisk1() to match
the prototype of open().
To generate a diff of this commit:
cvs rdiff -u -r1.49.12.1 -r1.49.12.2 src/include/util.h
cvs rdiff -u -r1.10.6.1 -r1.10.6.2 src/lib/libutil/opendisk.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/include/util.h
diff -u src/include/util.h:1.49.12.1 src/include/util.h:1.49.12.2
--- src/include/util.h:1.49.12.1 Mon Oct 5 11:46:21 2009
+++ src/include/util.h Wed Oct 14 09:13:54 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: util.h,v 1.49.12.1 2009/10/05 11:46:21 sborrill Exp $ */
+/* $NetBSD: util.h,v 1.49.12.2 2009/10/14 09:13:54 sborrill Exp $ */
/*-
* Copyright (c) 1995
@@ -81,7 +81,7 @@
void logwtmpx(const char *, const char *, const char *, int, int);
int opendisk(const char *, int, char *, size_t, int);
int opendisk1(const char *, int, char *, size_t, int,
- int (*)(const char *, int, mode_t));
+ int (*)(const char *, int, ...));
int openpty(int *, int *, char *, struct termios *,
struct winsize *);
time_t parsedate(const char *, const time_t *, const int *);
Index: src/lib/libutil/opendisk.c
diff -u src/lib/libutil/opendisk.c:1.10.6.1 src/lib/libutil/opendisk.c:1.10.6.2
--- src/lib/libutil/opendisk.c:1.10.6.1 Mon Oct 5 11:46:21 2009
+++ src/lib/libutil/opendisk.c Wed Oct 14 09:13:54 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: opendisk.c,v 1.10.6.1 2009/10/05 11:46:21 sborrill Exp $ */
+/* $NetBSD: opendisk.c,v 1.10.6.2 2009/10/14 09:13:54 sborrill Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: opendisk.c,v 1.10.6.1 2009/10/05 11:46:21 sborrill Exp $");
+__RCSID("$NetBSD: opendisk.c,v 1.10.6.2 2009/10/14 09:13:54 sborrill Exp $");
#endif
#include <sys/param.h>
@@ -46,7 +46,7 @@
static int
__opendisk(const char *path, int flags, char *buf, size_t buflen, int iscooked,
- int (*ofn)(const char *, int, mode_t))
+ int (*ofn)(const char *, int, ...))
{
int f, rawpart;
@@ -92,12 +92,12 @@
opendisk(const char *path, int flags, char *buf, size_t buflen, int iscooked)
{
- return __opendisk(path, flags, buf, buflen, iscooked, (void *)open);
+ return __opendisk(path, flags, buf, buflen, iscooked, open);
}
int
opendisk1(const char *path, int flags, char *buf, size_t buflen, int iscooked,
- int (*ofn)(const char *, int, mode_t))
+ int (*ofn)(const char *, int, ...))
{
return __opendisk(path, flags, buf, buflen, iscooked, ofn);
