From cbc85992cd683cbadbf2ed2011cad1ee04aa42b5 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Tue, 4 Jan 2000 17:51:12 +0000 Subject: Update. 2000-01-04 Andreas Jaeger * nss/nss_db/dummy-db.h (struct db24): Add missing field flags. (struct db27): Add missing fields byteswapped, join and flags; remove wrong member handleq. (struct dbc27): Correct lock field. * nss/makedb.c: Remove __P. 2000-01-04 Andreas Jaeger * nss/nss_db/db-open.c (internal_setent): Check for db_open for success, fix a memory leak and clean up function. 2000-01-04 Ulrich Drepper * Makefile (install): Pass $(install_root) to ldconfig. Patch by Akira YOSHIYAMA . 2000-01-03 Jakub Jelinek * soft-fp/op-1.h: Fix division for machines using not normalizing version of udiv_qrnnd in longlong.h. * soft-fp/sysdeps/mips/sfp-machine.h: Likewise. * soft-fp/sysdeps/mips/mips64/sfp-machine.h: Likewise. * soft-fp/sysdeps/sparc/sparc64/sfp-machine.h: Likewise. Patch by Eddie C. Dost . * soft-fp/soft-fp.h (QItype, UQItype): New types used by longlong.h. 2000-01-03 Andreas Schwab * sysdeps/generic/dl-sysdep.c: Initialize __libc_multiple_libcs, needed for change in common symbol handing in newer binutils. --- nss/nss_db/dummy-db.h | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'nss/nss_db/dummy-db.h') diff --git a/nss/nss_db/dummy-db.h b/nss/nss_db/dummy-db.h index 600d51d984..6ac8b77bb1 100644 --- a/nss/nss_db/dummy-db.h +++ b/nss/nss_db/dummy-db.h @@ -70,6 +70,7 @@ struct db24 int (*put) (void *, void *, DBT *, DBT *, uint32_t); int (*stat) (void *, void *, void *(*)(size_t), uint32_t); int (*sync) (void *, uint32_t); + uint32_t flags; }; @@ -99,6 +100,7 @@ struct db27 void *mutexp; enum { dummy27 } type; int byteswapped; + int saved_open_fd; void *dbenv; void *mp_dbenv; void *internal; @@ -114,9 +116,6 @@ struct db27 void *tqh_first; void **tqh_last; } active_queue; - struct { - void *lh_first; - } handleq; uint8_t fileid[20]; uint32_t log_fileid; size_t pgsize; @@ -130,9 +129,11 @@ struct db27 int (*del) (void *, void *, DBT *, uint32_t); int (*fd) (void *, int *); int (*get) (void *, void *, DBT *, DBT *, uint32_t); + int (*join) (void *, void **, uint32_t, void **); int (*put) (void *, void *, DBT *, DBT *, uint32_t); int (*stat) (void *, void *, void *(*)(size_t), uint32_t); int (*sync) (void *, uint32_t); + uint32_t flags; }; @@ -148,7 +149,10 @@ struct dbc27 uint32_t lid; uint32_t locker; DBT lock_dbt; - uint32_t lock[14]; + struct{ + uint32_t pgno; + uint8_t fileid[20]; + } lock; size_t mylock; DBT rkey; DBT rdata; -- cgit v1.2.3