mirror of
https://sourceware.org/git/glibc.git
synced 2025-07-29 11:41:21 +03:00
Update.
1998-06-09 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/sysv/linux/netinet/ip.h (struct ip_options): Define __data member only for gcc. Reported by ak@muc.de. * misc/mntent.h: Undo last patch. * sysdeps/unix/sysv/linux/fstatvfs.c (fstatvfs): Undo last patch. * misc/tst/mntent.c: Adjust code for this change. * io/fts.c: Updated from a slightly more recent BSD version. * io/fts.h: Likewise. * libc.map: Add __libc_stack_end. * db2/Makefile (routines): Add lock_region. * db2/config.h: Update from db-2.4.14. * db2/db.h: Likewise. * db2/db_185.h: Likewise. * db2/db_int.h: Likewise. * db2/bt_close.c: Likewise. * db2/bt_compare.c: Likewise. * db2/bt_conv.c: Likewise. * db2/bt_cursor.c: Likewise. * db2/bt_delete.c: Likewise. * db2/bt_open.c: Likewise. * db2/bt_page.c: Likewise. * db2/bt_put.c: Likewise. * db2/bt_rec.c: Likewise. * db2/bt_recno.c: Likewise. * db2/bt_rsearch.c: Likewise. * db2/bt_search.c: Likewise. * db2/bt_split.c: Likewise. * db2/bt_stat.c: Likewise. * db2/btree.src: Likewise. * db2/btree_auto.c: Likewise. * db2/getlong.c: Likewise. * db2/db_appinit.c: Likewise. * db2/db_apprec.c: Likewise. * db2/db_byteorder.c: Likewise. * db2/db_err.c: Likewise. * db2/db_log2.c: Likewise. * db2/db_region.c: Likewise. * db2/db_salloc.c: Likewise. * db2/db_shash.c: Likewise. * db2/db.c: Likewise. * db2/db.src: Likewise. * db2/db_auto.c: Likewise. * db2/db_conv.c: Likewise. * db2/db_dispatch.c: Likewise. * db2/db_dup.c: Likewise. * db2/db_overflow.c: Likewise. * db2/db_pr.c: Likewise. * db2/db_rec.c: Likewise. * db2/db_ret.c: Likewise. * db2/db_thread.c: Likewise. * db2/db185.c: Likewise. * db2/db185_int.h: Likewise. * db2/dbm.c: Likewise. * db2/hash.c: Likewise. * db2/hash.src: Likewise. * db2/hash_auto.c: Likewise. * db2/hash_conv.c: Likewise. * db2/hash_debug.c: Likewise. * db2/hash_dup.c: Likewise. * db2/hash_func.c: Likewise. * db2/hash_page.c: Likewise. * db2/hash_rec.c: Likewise. * db2/hash_stat.c: Likewise. * db2/btree.h: Likewise. * db2/btree_ext.h: Likewise. * db2/clib_ext.h: Likewise. * db2/common_ext.h: Likewise. * db2/cxx_int.h: Likewise. * db2/db.h.src: Likewise. * db2/db_185.h.src: Likewise. * db2/db_am.h: Likewise. * db2/db_auto.h: Likewise. * db2/db_cxx.h: Likewise. * db2/db_dispatch.h: Likewise. * db2/db_ext.h: Likewise. * db2/db_int.h.src: Likewise. * db2/db_page.h: Likewise. * db2/db_shash.h: Likewise. * db2/db_swap.h: Likewise. * db2/hash.h: Likewise. * db2/hash_ext.h: Likewise. * db2/lock.h: Likewise. * db2/lock_ext.h: Likewise. * db2/log.h: Likewise. * db2/log_ext.h: Likewise. * db2/mp.h: Likewise. * db2/mp_ext.h: Likewise. * db2/mutex_ext.h: Likewise. * db2/os_ext.h: Likewise. * db2/os_func.h: Likewise. * db2/queue.h: Likewise. * db2/shqueue.h: Likewise. * db2/txn.h: Likewise. * db2/lock.c: Likewise. * db2/lock_conflict.c: Likewise. * db2/lock_deadlock.c: Likewise. * db2/lock_region.c: Likewise. * db2/lock_util.c: Likewise. * db2/log.c: Likewise. * db2/log.src: Likewise. * db2/log_archive.c: Likewise. * db2/log_auto.c: Likewise. * db2/log_compare.c: Likewise. * db2/log_findckp.c: Likewise. * db2/log_get.c: Likewise. * db2/log_put.c: Likewise. * db2/log_rec.c: Likewise. * db2/log_register.c: Likewise. * db2/mp_bh.c: Likewise. * db2/mp_fget.c: Likewise. * db2/mp_fopen.c: Likewise. * db2/mp_fput.c: Likewise. * db2/mp_fset.c: Likewise. * db2/mp_open.c: Likewise. * db2/mp_pr.c: Likewise. * db2/mp_region.c: Likewise. * db2/mp_sync.c: Likewise. * db2/68020.gcc: Likewise. * db2/mutex.c: Likewise. * db2/parisc.gcc: Likewise. * db2/parisc.hp: Likewise. * db2/sco.cc: Likewise. * db2/os_abs.c: Likewise. * db2/os_alloc.c: Likewise. * db2/os_config.c: Likewise. * db2/os_dir.c: Likewise. * db2/os_fid.c: Likewise. * db2/os_fsync.c: Likewise. * db2/os_map.c: Likewise. * db2/os_oflags.c: Likewise. * db2/os_open.c: Likewise. * db2/os_rpath.c: Likewise. * db2/os_rw.c: Likewise. * db2/os_seek.c: Likewise. * db2/os_sleep.c: Likewise. * db2/os_spin.c: Likewise. * db2/os_stat.c: Likewise. * db2/os_unlink.c: Likewise. * db2/db_archive.c: Likewise. * db2/db_checkpoint.c: Likewise. * db2/db_deadlock.c: Likewise. * db2/db_dump.c: Likewise. * db2/db_dump185.c: Likewise. * db2/db_load.c: Likewise. * db2/db_printlog.c: Likewise. * db2/db_recover.c: Likewise. * db2/db_stat.c: Likewise. * db2/txn.c: Likewise. * db2/txn.src: Likewise. * db2/txn_auto.c: Likewise. * db2/txn_rec.c: Likewise. * elf/rtld.c: Move definition of __libc_stack_end to ... * sysdeps/generic/dl-sysdep.h: ...here. * sysdeps/unix/sysv/linux/fstatvfs.c: Handle nodiratime option. * sysdeps/unix/sysv/linux/bits/statvfs.h: Define ST_NODIRATIME. * sysdeps/unix/sysv/linux/sys/mount.h: Define MS_NODIRATIME. 1998-06-08 21:44 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/sysv/linux/fstatvfs.c: Handle constant option string from mntent correctly. 1998-06-06 Andreas Jaeger <aj@arthur.rhein-neckar.de> * sunrpc/Makefile (generated): Correct typo. 1998-06-04 Philip Blundell <philb@gnu.org> * elf/elf.h (EM_ARM, et al.): New definitions. * sysdeps/arm/dl-machine.h: Update for new draft ARM ELF ABI.
This commit is contained in:
Ulrich Drepper
@ -1,14 +1,14 @@
|
||||
/*-
|
||||
* See the file LICENSE for redistribution information.
|
||||
*
|
||||
* Copyright (c) 1996, 1997
|
||||
* Copyright (c) 1996, 1997, 1998
|
||||
* Sleepycat Software. All rights reserved.
|
||||
*/
|
||||
|
||||
#include "config.h"
|
||||
|
||||
#ifndef lint
|
||||
static const char sccsid[] = "@(#)db_err.c 10.21 (Sleepycat) 1/13/98";
|
||||
static const char sccsid[] = "@(#)db_err.c 10.25 (Sleepycat) 5/2/98";
|
||||
#endif /* not lint */
|
||||
|
||||
#ifndef NO_SYSTEM_INCLUDES
|
||||
@ -26,6 +26,7 @@ static const char sccsid[] = "@(#)db_err.c 10.21 (Sleepycat) 1/13/98";
|
||||
#include "db_int.h"
|
||||
#include "common_ext.h"
|
||||
|
||||
static int __db_keyempty __P((const DB_ENV *));
|
||||
static int __db_rdonly __P((const DB_ENV *, const char *));
|
||||
|
||||
/*
|
||||
@ -81,11 +82,11 @@ __db_err(dbenv, fmt, va_alist)
|
||||
* appears before the assignment in the __db__panic() call.
|
||||
*/
|
||||
static int __db_ecursor __P((DB *, DB_TXN *, DBC **));
|
||||
static int __db_edel __P((DB *, DB_TXN *, DBT *, int));
|
||||
static int __db_edel __P((DB *, DB_TXN *, DBT *, u_int32_t));
|
||||
static int __db_efd __P((DB *, int *));
|
||||
static int __db_egp __P((DB *, DB_TXN *, DBT *, DBT *, int));
|
||||
static int __db_estat __P((DB *, void *, void *(*)(size_t), int));
|
||||
static int __db_esync __P((DB *, int));
|
||||
static int __db_egp __P((DB *, DB_TXN *, DBT *, DBT *, u_int32_t));
|
||||
static int __db_estat __P((DB *, void *, void *(*)(size_t), u_int32_t));
|
||||
static int __db_esync __P((DB *, u_int32_t));
|
||||
|
||||
/*
|
||||
* __db_ecursor --
|
||||
@ -113,7 +114,7 @@ __db_edel(a, b, c, d)
|
||||
DB *a;
|
||||
DB_TXN *b;
|
||||
DBT *c;
|
||||
int d;
|
||||
u_int32_t d;
|
||||
{
|
||||
COMPQUIET(a, NULL);
|
||||
COMPQUIET(b, NULL);
|
||||
@ -147,7 +148,7 @@ __db_egp(a, b, c, d, e)
|
||||
DB *a;
|
||||
DB_TXN *b;
|
||||
DBT *c, *d;
|
||||
int e;
|
||||
u_int32_t e;
|
||||
{
|
||||
COMPQUIET(a, NULL);
|
||||
COMPQUIET(b, NULL);
|
||||
@ -167,7 +168,7 @@ __db_estat(a, b, c, d)
|
||||
DB *a;
|
||||
void *b;
|
||||
void *(*c) __P((size_t));
|
||||
int d;
|
||||
u_int32_t d;
|
||||
{
|
||||
COMPQUIET(a, NULL);
|
||||
COMPQUIET(b, NULL);
|
||||
@ -184,7 +185,7 @@ __db_estat(a, b, c, d)
|
||||
static int
|
||||
__db_esync(a, b)
|
||||
DB *a;
|
||||
int b;
|
||||
u_int32_t b;
|
||||
{
|
||||
COMPQUIET(a, NULL);
|
||||
COMPQUIET(b, 0);
|
||||
@ -208,6 +209,10 @@ __db_panic(dbp)
|
||||
*
|
||||
* We should call mpool and have it shut down the file, so we get
|
||||
* other processes sharing this file as well.
|
||||
*
|
||||
* Chaos reigns within.
|
||||
* Reflect, repent, and reboot.
|
||||
* Order shall return.
|
||||
*/
|
||||
dbp->cursor = __db_ecursor;
|
||||
dbp->del = __db_edel;
|
||||
@ -235,13 +240,13 @@ __db_panic(dbp)
|
||||
* __db_fchk --
|
||||
* General flags checking routine.
|
||||
*
|
||||
* PUBLIC: int __db_fchk __P((DB_ENV *, const char *, int, int));
|
||||
* PUBLIC: int __db_fchk __P((DB_ENV *, const char *, u_int32_t, u_int32_t));
|
||||
*/
|
||||
int
|
||||
__db_fchk(dbenv, name, flags, ok_flags)
|
||||
DB_ENV *dbenv;
|
||||
const char *name;
|
||||
int flags, ok_flags;
|
||||
u_int32_t flags, ok_flags;
|
||||
{
|
||||
DB_CHECK_FLAGS(dbenv, name, flags, ok_flags);
|
||||
return (0);
|
||||
@ -251,13 +256,14 @@ __db_fchk(dbenv, name, flags, ok_flags)
|
||||
* __db_fcchk --
|
||||
* General combination flags checking routine.
|
||||
*
|
||||
* PUBLIC: int __db_fcchk __P((DB_ENV *, const char *, int, int, int));
|
||||
* PUBLIC: int __db_fcchk
|
||||
* PUBLIC: __P((DB_ENV *, const char *, u_int32_t, u_int32_t, u_int32_t));
|
||||
*/
|
||||
int
|
||||
__db_fcchk(dbenv, name, flags, flag1, flag2)
|
||||
DB_ENV *dbenv;
|
||||
const char *name;
|
||||
int flags, flag1, flag2;
|
||||
u_int32_t flags, flag1, flag2;
|
||||
{
|
||||
DB_CHECK_FCOMBO(dbenv, name, flags, flag1, flag2);
|
||||
return (0);
|
||||
@ -267,12 +273,13 @@ __db_fcchk(dbenv, name, flags, flag1, flag2)
|
||||
* __db_cdelchk --
|
||||
* Common cursor delete argument checking routine.
|
||||
*
|
||||
* PUBLIC: int __db_cdelchk __P((const DB *, int, int, int));
|
||||
* PUBLIC: int __db_cdelchk __P((const DB *, u_int32_t, int, int));
|
||||
*/
|
||||
int
|
||||
__db_cdelchk(dbp, flags, isrdonly, isvalid)
|
||||
const DB *dbp;
|
||||
int flags, isrdonly, isvalid;
|
||||
u_int32_t flags;
|
||||
int isrdonly, isvalid;
|
||||
{
|
||||
/* Check for changes to a read-only tree. */
|
||||
if (isrdonly)
|
||||
@ -292,17 +299,18 @@ __db_cdelchk(dbp, flags, isrdonly, isvalid)
|
||||
* __db_cgetchk --
|
||||
* Common cursor get argument checking routine.
|
||||
*
|
||||
* PUBLIC: int __db_cgetchk __P((const DB *, DBT *, DBT *, int, int));
|
||||
* PUBLIC: int __db_cgetchk __P((const DB *, DBT *, DBT *, u_int32_t, int));
|
||||
*/
|
||||
int
|
||||
__db_cgetchk(dbp, key, data, flags, isvalid)
|
||||
const DB *dbp;
|
||||
DBT *key, *data;
|
||||
int flags, isvalid;
|
||||
u_int32_t flags;
|
||||
int isvalid;
|
||||
{
|
||||
int check_key;
|
||||
int key_einval, key_flags;
|
||||
|
||||
check_key = 0;
|
||||
key_flags = key_einval = 0;
|
||||
|
||||
/* Check for invalid dbc->c_get() function flags. */
|
||||
switch (flags) {
|
||||
@ -311,10 +319,13 @@ __db_cgetchk(dbp, key, data, flags, isvalid)
|
||||
case DB_LAST:
|
||||
case DB_NEXT:
|
||||
case DB_PREV:
|
||||
key_flags = 1;
|
||||
break;
|
||||
case DB_SET_RANGE:
|
||||
check_key = 1;
|
||||
key_einval = key_flags = 1;
|
||||
break;
|
||||
case DB_SET:
|
||||
key_einval = 1;
|
||||
break;
|
||||
case DB_GET_RECNO:
|
||||
if (!F_ISSET(dbp, DB_BT_RECNUM))
|
||||
@ -323,14 +334,14 @@ __db_cgetchk(dbp, key, data, flags, isvalid)
|
||||
case DB_SET_RECNO:
|
||||
if (!F_ISSET(dbp, DB_BT_RECNUM))
|
||||
goto err;
|
||||
check_key = 1;
|
||||
key_einval = key_flags = 1;
|
||||
break;
|
||||
default:
|
||||
err: return (__db_ferr(dbp->dbenv, "c_get", 0));
|
||||
}
|
||||
|
||||
/* Check for invalid key/data flags. */
|
||||
if (check_key)
|
||||
if (key_flags)
|
||||
DB_CHECK_FLAGS(dbp->dbenv, "key", key->flags,
|
||||
DB_DBT_MALLOC | DB_DBT_USERMEM | DB_DBT_PARTIAL);
|
||||
DB_CHECK_FLAGS(dbp->dbenv, "data", data->flags,
|
||||
@ -340,11 +351,15 @@ err: return (__db_ferr(dbp->dbenv, "c_get", 0));
|
||||
if (F_ISSET(dbp, DB_AM_THREAD)) {
|
||||
if (!F_ISSET(data, DB_DBT_USERMEM | DB_DBT_MALLOC))
|
||||
return (__db_ferr(dbp->dbenv, "threaded data", 1));
|
||||
if (check_key &&
|
||||
if (key_flags &&
|
||||
!F_ISSET(key, DB_DBT_USERMEM | DB_DBT_MALLOC))
|
||||
return (__db_ferr(dbp->dbenv, "threaded key", 1));
|
||||
}
|
||||
|
||||
/* Check for missing keys. */
|
||||
if (key_einval && (key->data == NULL || key->size == 0))
|
||||
return (__db_keyempty(dbp->dbenv));
|
||||
|
||||
/*
|
||||
* The cursor must be initialized for DB_CURRENT, return -1 for an
|
||||
* invalid cursor, otherwise 0.
|
||||
@ -357,23 +372,24 @@ err: return (__db_ferr(dbp->dbenv, "c_get", 0));
|
||||
* Common cursor put argument checking routine.
|
||||
*
|
||||
* PUBLIC: int __db_cputchk __P((const DB *,
|
||||
* PUBLIC: const DBT *, DBT *, int, int, int));
|
||||
* PUBLIC: const DBT *, DBT *, u_int32_t, int, int));
|
||||
*/
|
||||
int
|
||||
__db_cputchk(dbp, key, data, flags, isrdonly, isvalid)
|
||||
const DB *dbp;
|
||||
const DBT *key;
|
||||
DBT *data;
|
||||
int flags, isrdonly, isvalid;
|
||||
u_int32_t flags;
|
||||
int isrdonly, isvalid;
|
||||
{
|
||||
int check_key;
|
||||
int key_einval, key_flags;
|
||||
|
||||
/* Check for changes to a read-only tree. */
|
||||
if (isrdonly)
|
||||
return (__db_rdonly(dbp->dbenv, "c_put"));
|
||||
|
||||
/* Check for invalid dbc->c_put() function flags. */
|
||||
check_key = 0;
|
||||
key_einval = key_flags = 0;
|
||||
switch (flags) {
|
||||
case DB_AFTER:
|
||||
case DB_BEFORE:
|
||||
@ -388,19 +404,23 @@ __db_cputchk(dbp, key, data, flags, isrdonly, isvalid)
|
||||
case DB_KEYLAST:
|
||||
if (dbp->type == DB_RECNO)
|
||||
goto err;
|
||||
check_key = 1;
|
||||
key_einval = key_flags = 1;
|
||||
break;
|
||||
default:
|
||||
err: return (__db_ferr(dbp->dbenv, "c_put", 0));
|
||||
}
|
||||
|
||||
/* Check for invalid key/data flags. */
|
||||
if (check_key)
|
||||
if (key_flags)
|
||||
DB_CHECK_FLAGS(dbp->dbenv, "key", key->flags,
|
||||
DB_DBT_MALLOC | DB_DBT_USERMEM | DB_DBT_PARTIAL);
|
||||
DB_CHECK_FLAGS(dbp->dbenv, "data", data->flags,
|
||||
DB_DBT_MALLOC | DB_DBT_USERMEM | DB_DBT_PARTIAL);
|
||||
|
||||
/* Check for missing keys. */
|
||||
if (key_einval && (key->data == NULL || key->size == 0))
|
||||
return (__db_keyempty(dbp->dbenv));
|
||||
|
||||
/*
|
||||
* The cursor must be initialized for anything other than DB_KEYFIRST
|
||||
* and DB_KEYLAST, return -1 for an invalid cursor, otherwise 0.
|
||||
@ -413,12 +433,14 @@ err: return (__db_ferr(dbp->dbenv, "c_put", 0));
|
||||
* __db_delchk --
|
||||
* Common delete argument checking routine.
|
||||
*
|
||||
* PUBLIC: int __db_delchk __P((const DB *, int, int));
|
||||
* PUBLIC: int __db_delchk __P((const DB *, DBT *, u_int32_t, int));
|
||||
*/
|
||||
int
|
||||
__db_delchk(dbp, flags, isrdonly)
|
||||
__db_delchk(dbp, key, flags, isrdonly)
|
||||
const DB *dbp;
|
||||
int flags, isrdonly;
|
||||
DBT *key;
|
||||
u_int32_t flags;
|
||||
int isrdonly;
|
||||
{
|
||||
/* Check for changes to a read-only tree. */
|
||||
if (isrdonly)
|
||||
@ -427,6 +449,10 @@ __db_delchk(dbp, flags, isrdonly)
|
||||
/* Check for invalid db->del() function flags. */
|
||||
DB_CHECK_FLAGS(dbp->dbenv, "delete", flags, 0);
|
||||
|
||||
/* Check for missing keys. */
|
||||
if (key->data == NULL || key->size == 0)
|
||||
return (__db_keyempty(dbp->dbenv));
|
||||
|
||||
return (0);
|
||||
}
|
||||
|
||||
@ -434,14 +460,14 @@ __db_delchk(dbp, flags, isrdonly)
|
||||
* __db_getchk --
|
||||
* Common get argument checking routine.
|
||||
*
|
||||
* PUBLIC: int __db_getchk __P((const DB *, const DBT *, DBT *, int));
|
||||
* PUBLIC: int __db_getchk __P((const DB *, const DBT *, DBT *, u_int32_t));
|
||||
*/
|
||||
int
|
||||
__db_getchk(dbp, key, data, flags)
|
||||
const DB *dbp;
|
||||
const DBT *key;
|
||||
DBT *data;
|
||||
int flags;
|
||||
u_int32_t flags;
|
||||
{
|
||||
/* Check for invalid db->get() function flags. */
|
||||
DB_CHECK_FLAGS(dbp->dbenv,
|
||||
@ -457,6 +483,10 @@ __db_getchk(dbp, key, data, flags)
|
||||
!F_ISSET(data, DB_DBT_MALLOC | DB_DBT_USERMEM))
|
||||
return (__db_ferr(dbp->dbenv, "threaded data", 1));
|
||||
|
||||
/* Check for missing keys. */
|
||||
if (key->data == NULL || key->size == 0)
|
||||
return (__db_keyempty(dbp->dbenv));
|
||||
|
||||
return (0);
|
||||
}
|
||||
|
||||
@ -464,14 +494,16 @@ __db_getchk(dbp, key, data, flags)
|
||||
* __db_putchk --
|
||||
* Common put argument checking routine.
|
||||
*
|
||||
* PUBLIC: int __db_putchk __P((const DB *, DBT *, const DBT *, int, int, int));
|
||||
* PUBLIC: int __db_putchk
|
||||
* PUBLIC: __P((const DB *, DBT *, const DBT *, u_int32_t, int, int));
|
||||
*/
|
||||
int
|
||||
__db_putchk(dbp, key, data, flags, isrdonly, isdup)
|
||||
const DB *dbp;
|
||||
DBT *key;
|
||||
const DBT *data;
|
||||
int flags, isrdonly, isdup;
|
||||
u_int32_t flags;
|
||||
int isrdonly, isdup;
|
||||
{
|
||||
/* Check for changes to a read-only tree. */
|
||||
if (isrdonly)
|
||||
@ -488,12 +520,17 @@ __db_putchk(dbp, key, data, flags, isrdonly, isdup)
|
||||
DB_CHECK_FCOMBO(dbp->dbenv,
|
||||
"data", data->flags, DB_DBT_MALLOC, DB_DBT_USERMEM);
|
||||
|
||||
/* Check for missing keys. */
|
||||
if (key->data == NULL || key->size == 0)
|
||||
return (__db_keyempty(dbp->dbenv));
|
||||
|
||||
/* Check for partial puts in the presence of duplicates. */
|
||||
if (isdup && F_ISSET(data, DB_DBT_PARTIAL)) {
|
||||
__db_err(dbp->dbenv,
|
||||
"a partial put in the presence of duplicates requires a cursor operation");
|
||||
return (EINVAL);
|
||||
}
|
||||
|
||||
return (0);
|
||||
}
|
||||
|
||||
@ -501,12 +538,12 @@ __db_putchk(dbp, key, data, flags, isrdonly, isdup)
|
||||
* __db_statchk --
|
||||
* Common stat argument checking routine.
|
||||
*
|
||||
* PUBLIC: int __db_statchk __P((const DB *, int));
|
||||
* PUBLIC: int __db_statchk __P((const DB *, u_int32_t));
|
||||
*/
|
||||
int
|
||||
__db_statchk(dbp, flags)
|
||||
const DB *dbp;
|
||||
int flags;
|
||||
u_int32_t flags;
|
||||
{
|
||||
/* Check for invalid db->stat() function flags. */
|
||||
DB_CHECK_FLAGS(dbp->dbenv, "stat", flags, DB_RECORDCOUNT);
|
||||
@ -522,12 +559,12 @@ __db_statchk(dbp, flags)
|
||||
* __db_syncchk --
|
||||
* Common sync argument checking routine.
|
||||
*
|
||||
* PUBLIC: int __db_syncchk __P((const DB *, int));
|
||||
* PUBLIC: int __db_syncchk __P((const DB *, u_int32_t));
|
||||
*/
|
||||
int
|
||||
__db_syncchk(dbp, flags)
|
||||
const DB *dbp;
|
||||
int flags;
|
||||
u_int32_t flags;
|
||||
{
|
||||
/* Check for invalid db->sync() function flags. */
|
||||
DB_CHECK_FLAGS(dbp->dbenv, "sync", flags, 0);
|
||||
@ -542,13 +579,13 @@ __db_syncchk(dbp, flags)
|
||||
* PUBLIC: int __db_ferr __P((const DB_ENV *, const char *, int));
|
||||
*/
|
||||
int
|
||||
__db_ferr(dbenv, name, combo)
|
||||
__db_ferr(dbenv, name, iscombo)
|
||||
const DB_ENV *dbenv;
|
||||
const char *name;
|
||||
int combo;
|
||||
int iscombo;
|
||||
{
|
||||
__db_err(dbenv, "illegal flag %sspecified to %s",
|
||||
combo ? "combination " : "", name);
|
||||
iscombo ? "combination " : "", name);
|
||||
return (EINVAL);
|
||||
}
|
||||
|
||||
@ -564,3 +601,15 @@ __db_rdonly(dbenv, name)
|
||||
__db_err(dbenv, "%s: attempt to modify a read-only tree", name);
|
||||
return (EACCES);
|
||||
}
|
||||
|
||||
/*
|
||||
* __db_keyempty --
|
||||
* Common missing or empty key value message.
|
||||
*/
|
||||
static int
|
||||
__db_keyempty(dbenv)
|
||||
const DB_ENV *dbenv;
|
||||
{
|
||||
__db_err(dbenv, "missing or empty key value specified");
|
||||
return (EINVAL);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user