[src/trunk]: src In a furious blaze of *facepalm* / "what was i thinking?", f...

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

details:   https://anonhg.NetBSD.org/src/rev/80f8b179127f
branches:  trunk
changeset: 748106:80f8b179127f
user:      pooka <pooka%NetBSD.org@localhost>
date:      Tue Oct 13 22:00:31 2009 +0000

description:
In a furious blaze of *facepalm* / "what was i thinking?", fix the
open routine function pointer prototype of opendisk1() to match
the prototype of open().

diffstat:

 include/util.h         |   4 ++--
 lib/libutil/opendisk.c |  10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diffs (60 lines):

diff -r f41338879800 -r 80f8b179127f include/util.h
--- a/include/util.h    Tue Oct 13 21:57:52 2009 +0000
+++ b/include/util.h    Tue Oct 13 22:00:31 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: util.h,v 1.52 2009/09/08 21:34:57 pooka Exp $  */
+/*     $NetBSD: util.h,v 1.53 2009/10/13 22:00:31 pooka Exp $  */
 
 /*-
  * Copyright (c) 1995
@@ -83,7 +83,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 *);
 #ifndef __LIBC12_SOURCE__
diff -r f41338879800 -r 80f8b179127f lib/libutil/opendisk.c
--- a/lib/libutil/opendisk.c    Tue Oct 13 21:57:52 2009 +0000
+++ b/lib/libutil/opendisk.c    Tue Oct 13 22:00:31 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: opendisk.c,v 1.11 2009/09/08 21:34:57 pooka Exp $      */
+/*     $NetBSD: opendisk.c,v 1.12 2009/10/13 22:00:31 pooka 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.11 2009/09/08 21:34:57 pooka Exp $");
+__RCSID("$NetBSD: opendisk.c,v 1.12 2009/10/13 22:00:31 pooka 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);