Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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().
This commit is contained in:
pooka 2009-10-13 22:00:31 +00:00
parent ddc943db02
commit 363b14551a
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/util.h
View File

@ -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 * Copyright (c) 1995
@ -83,7 +83,7 @@ void logwtmp(const char *, const char *, const char *);
void logwtmpx(const char *, const char *, const char *, int, int); void logwtmpx(const char *, const char *, const char *, int, int);
int opendisk(const char *, int, char *, size_t, int); int opendisk(const char *, int, char *, size_t, int);
int opendisk1(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 *, int openpty(int *, int *, char *, struct termios *,
struct winsize *); struct winsize *);
#ifndef __LIBC12_SOURCE__ #ifndef __LIBC12_SOURCE__

10
lib/libutil/opendisk.c
View File

@ -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. * Copyright (c) 1997 The NetBSD Foundation, Inc.
@ -31,7 +31,7 @@
#include <sys/cdefs.h> #include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint) #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 #endif
#include <sys/param.h> #include <sys/param.h>
@ -46,7 +46,7 @@ __RCSID("$NetBSD: opendisk.c,v 1.11 2009/09/08 21:34:57 pooka Exp $");
static int static int
__opendisk(const char *path, int flags, char *buf, size_t buflen, int iscooked, __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; int f, rawpart;
@ -92,12 +92,12 @@ int
opendisk(const char *path, int flags, char *buf, size_t buflen, int iscooked) 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 int
opendisk1(const char *path, int flags, char *buf, size_t buflen, int iscooked, 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); return __opendisk(path, flags, buf, buflen, iscooked, ofn);