 @@ -1,106 +1,106 @@
-/*	$NetBSD: db.c,v 1.19 2019/10/05 18:01:52 uwe Exp $	*/
+/*	$NetBSD: db.c,v 1.20 2019/10/05 18:07:58 uwe Exp $	*/
 /*-
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #if HAVE_NBTOOL_CONFIG_H
 #include "nbtool_config.h"
 #endif
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: db.c,v 1.19 2019/10/05 18:01:52 uwe Exp $");
+__RCSID("$NetBSD: db.c,v 1.20 2019/10/05 18:07:58 uwe Exp $");
 #include "namespace.h"
 #include <sys/types.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <stddef.h>
 #include <stdio.h>
 #include <db.h>
-static int __dberr(void);
+static int __dberr(const DB *, ...);
 #ifdef __weak_alias
 __weak_alias(dbopen,_dbopen)
 #endif
 #ifndef O_CLOEXEC
 #define O_CLOEXEC 0
 #endif
 DB *
 dbopen(const char *fname, int flags, mode_t mode, DBTYPE type,
     const void *openinfo)
+{
 #define	DB_FLAGS	(DB_LOCK | DB_SHMEM | DB_TXN)
 #define	USE_OPEN_FLAGS							\
 	(O_CREAT | O_EXCL | O_EXLOCK | O_NONBLOCK | O_RDONLY |		\
 	 O_RDWR | O_SHLOCK | O_TRUNC | O_CLOEXEC)
 	if ((flags & ~(USE_OPEN_FLAGS | DB_FLAGS)) == 0)
 		switch (type) {
 		case DB_BTREE:
 			return (__bt_open(fname, flags & USE_OPEN_FLAGS,
 			    mode, openinfo, (int)(flags & DB_FLAGS)));
 		case DB_HASH:
 			return (__hash_open(fname, flags & USE_OPEN_FLAGS,
 			    mode, openinfo, (int)(flags & DB_FLAGS)));
 		case DB_RECNO:
 			return (__rec_open(fname, flags & USE_OPEN_FLAGS,
 			    mode, openinfo, (int)(flags & DB_FLAGS)));
+		}
 	errno = EINVAL;
 	return (NULL);
+}
 static int
-__dberr(void)
+__dberr(const DB *dbp, ...)
+{
 	return (RET_ERROR);
+}
 /*
  * __DBPANIC -- Stop.
+ *
  * Parameters:
  *	dbp:	pointer to the DB structure.
  */
 void
 __dbpanic(DB *dbp)
+{
 	/* The only thing that can succeed is a close. */
 	dbp->del = (int (*)(const DB *, const DBT *, u_int))__dberr;
 	dbp->fd = (int (*)(const DB *))__dberr;
 	dbp->get = (int (*)(const DB *, const DBT *, DBT *, u_int))__dberr;
 	dbp->put = (int (*)(const DB *, DBT *, const DBT *, u_int))__dberr;
 	dbp->seq = (int (*)(const DB *, DBT *, DBT *, u_int))__dberr;
 	dbp->sync = (int (*)(const DB *, u_int))__dberr;
+}