about summary refs log tree commit diff
path: root/db2/btree/bt_put.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1997-09-05 01:43:20 +0000
committerUlrich Drepper <drepper@redhat.com>1997-09-05 01:43:20 +0000
commit26b4d7667169f8db26fd8194b3c498ec58e50f90 (patch)
tree491a6edd9fe8961fe781a50c39517dae8a35321d /db2/btree/bt_put.c
parent800d775e426b9c0af63f711b79b09bf540c97456 (diff)
downloadglibc-26b4d7667169f8db26fd8194b3c498ec58e50f90.tar.gz
glibc-26b4d7667169f8db26fd8194b3c498ec58e50f90.tar.xz
glibc-26b4d7667169f8db26fd8194b3c498ec58e50f90.zip
1997-09-05 03:15  Ulrich Drepper  <drepper@cygnus.com>

	* Makefile (subdirs): Reorganize order so that nss follows add-ons.
	* config.make.in (LDAP): Add.
	* configure.in: Prepare for ldap add-on.
	* shlib-versions: Add version numbers for ldap NSS module.
	* nss/Makefile: Add rules to build ldap NSS module.

	* db/btree/bt_page.c (__bt_free): Update meta data information.

	Update db from db-2.3.6.
	* db2/db.h: Updated.
	* db2/btree/bt_close.c: Updated.
	* db2/btree/bt_compare.c: Updated.
	* db2/btree/bt_conv.c: Updated.
	* db2/btree/bt_cursor.c: Updated.
	* db2/btree/bt_delete.c: Updated.
	* db2/btree/bt_put.c: Updated.
	* db2/btree/bt_rec.c: Updated.
	* db2/btree/bt_recno.c: Updated.
	* db2/btree/bt_search.c: Updated.
	* db2/btree/bt_split.c: Updated.
	* db2/btree/bt_stat.c: Updated.
	* db2/common/db_appinit.c: Updated.
	* db2/common/db_apprec.c: Updated.
	* db2/common/db_byteorder.c: Updated.
	* db2/common/db_err.c: Updated.
	* db2/common/db_region.c: Updated.
	* db2/db/db.c: Updated.
	* db2/db/db_conv.c: Updated.
	* db2/db/db_dup.c: Updated.
	* db2/db/db_pr.c: Updated.
	* db2/db/db_ret.c: Updated.
	* db2/db185/db185.c: Updated.
	* db2/dbm/dbm.c: Updated.
	* db2/hash/hash_dup.c: Updated.
	* db2/include/db_am.h: Updated.
	* db2/include/db_page.h: Updated.
	* db2/include/mp.h: Updated.
	* db2/include/queue.h: Updated.
	* db2/log/log.c: Updated.
	* db2/log/log_findckp.c: Updated.
	* db2/log/log_get.c: Updated.
	* db2/log/log_rec.c: Updated.
	* db2/mp/mp_bh.c: Updated.
	* db2/mp/mp_fopen.c: Updated.
	* db2/mp/mp_pr.c: Updated.
	* db2/mp/mp_sync.c: Updated.
	* db2/mutex/x86.gcc: Updated.
	* db2/os/db_os_dir.c: Updated.
	* db2/os/db_os_fid.c: Updated.
	* db2/progs/db_archive/db_archive.c: Updated.
	* db2/progs/db_checkpoint/db_checkpoint.c: Updated.
	* db2/progs/db_deadlock/db_deadlock.c: Updated.
	* db2/progs/db_dump/db_dump.c: Updated.
	* db2/progs/db_dump185/db_dump185.c: Updated.
	* db2/progs/db_load/db_load.c: Updated.
	* db2/progs/db_printlog/db_printlog.c: Updated.
	* db2/progs/db_recover/db_recover.c: Updated.
	* db2/progs/db_stat/db_stat.c: Updated.
	* db2/txn/txn.c: Updated.
	* db2/txn/txn_rec.c: Updated.

	* db2/Makefile: Add rule to build db_printlog.
	* db2/config.h: Don't include endian.h and don't define
	WORDS_BIGENDIAN.  Only define HAVE_ENDIAN_H.

	* elf/dl-open.c (_dl_open): Make thread-safe.
	* elf/dl-close.c (_dl_close): Likewise.
	* elf/dlclose.c: Pretty print.
	* elf/dl-version.c (make_string): Use __strdup not strdup.
	(find_needed): Don't use l_searchlist of _dl_loaded, use the
	l_next list.
	* elf/dl-deps.c (_dl_map_object_deps): Remove variable head.

	* manual/math.texi: Add note about == and != for FP values.
	* manual/message.texi: Mention problems with relative paths and
	binstextdomain.
	* manual/string.texi: Mark strdupa and strndupa correctly as macros.

	* sunrpc/Makefile (CFLAGS-xkey_prot.c): Define to prevent warnings.
	* sunrpc/rpc_cout.c: Avoid needless races around return value.

	* sysdeps/generic/stpcpy.c: Include <config.h> if wanted.

	Update from tzdata-1997h.
	* time/africa: Updated.
	* time/europe: Updated.
	* time/iso3166.tab: Updated.
	* time/northamerica: Updated.
	* time/southamerica: Updated.
	* time/zone.tab: Updated.

1997-09-04 13:19  Richard Henderson  <rth@cygnus.com>

	* sysdeps/alpha/w_sqrt.S: Removed.
	* sysdeps/alpha/fpu/e_sqrt.c: New.  Obey -mieee and -mieee-with-inexact
	and build a version that is as fast as possible given the constraint.

1997-08-30  Andreas Jaeger  <aj@arthur.rhein-neckar.de>

	* manual/maint.texi: Document some defaults for configuration
	parameters.

1997-09-04 15:57  Ulrich Drepper  <drepper@cygnus.com>

	* termios/cfsetspeed.c (cfsetspeed): Change return value to int.
	* termios/termios.h: Change prototype accordingly.
	Reported by Andreas Jaeger <aj@arthur.rhein-neckar.de>.

1997-07-26 14:42  H.J. Lu  <hjl@gnu.ai.mit.edu>

	* libio/stdfiles.c (_libio_using_thunks): Define if
	_G_USING_THUNKS is defined.

	* libio/_G_config.h: Moved to ...
	* sysdeps/generic/_G_config.h: ...here.

	* sysdeps/unix/sysv/linux/_G_config.h: New,
	Add vtable thunks support.

1997-09-02  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* sysdeps/m68k/Makefile (pic-ccflag): Override it for more
	efficient code (together with a change in gcc).

	* Makeconfig (pic-ccflag): New variable.
	(CFLAGS-.os): Use it instead of hardcoding -fPIC.

1997-09-02  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* sysdeps/m68k/dl-machine.h (elf_machine_load_address): Use
	_dl_start instead of a local label, to avoid getting an unreadable
	label name.

1997-09-02  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* nss/Makefile ($(objpfx)libnss_db.so): Use $(dbobjdir) to find
	libdb.so.

	* Makeconfig (dbobjdir): Use db2.

1997-08-31  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* manual/maint.texi (Porting to Unix): Update description of the
	implementation of Unix system calls.
	(Contributors): Use real umlaut in tege's name.

1997-08-30  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* sysdeps/libm-ieee754/w_gamma.c: Make compilable with
	_IEEE_LIBM.
	* sysdeps/libm-ieee754/w_gammaf.c: Likewise.
	* sysdeps/libm-ieee754/w_gammal.c: Likewise.
Diffstat (limited to 'db2/btree/bt_put.c')
-rw-r--r--db2/btree/bt_put.c32
1 files changed, 14 insertions, 18 deletions
diff --git a/db2/btree/bt_put.c b/db2/btree/bt_put.c
index 632c3d185b..0f0b1e7126 100644
--- a/db2/btree/bt_put.c
+++ b/db2/btree/bt_put.c
@@ -47,7 +47,7 @@
 #include "config.h"
 
 #ifndef lint
-static const char sccsid[] = "@(#)bt_put.c	10.23 (Sleepycat) 8/22/97";
+static const char sccsid[] = "@(#)bt_put.c	10.24 (Sleepycat) 9/3/97";
 #endif /* not lint */
 
 #ifndef NO_SYSTEM_INCLUDES
@@ -120,7 +120,7 @@ retry:	/*
 	 */
 	replace = 0;
 	if (exact && flags == DB_NOOVERWRITE) {
-		if (!GET_BKEYDATA(h, indx + O_INDX)->deleted) {
+		if (!B_DISSET(GET_BKEYDATA(h, indx + O_INDX)->type)) {
 			ret = DB_KEYEXIST;
 			goto err;
 		}
@@ -436,16 +436,14 @@ __bam_iitem(dbp, hp, indxp, key, data, op, flags)
 	 */
 	bigkey = bigdata = 0;
 	if (LF_ISSET(BI_NEWKEY) && key->size > t->bt_ovflsize) {
-		kbo.deleted = 0;
-		kbo.type = B_OVERFLOW;
+		B_TSET(kbo.type, B_OVERFLOW, 0);
 		kbo.tlen = key->size;
 		if ((ret = __db_poff(dbp, key, &kbo.pgno, __bam_new)) != 0)
 			goto err;
 		bigkey = 1;
 	}
 	if (data->size > t->bt_ovflsize) {
-		dbo.deleted = 0;
-		dbo.type = B_OVERFLOW;
+		B_TSET(dbo.type, B_OVERFLOW, 0);
 		dbo.tlen = data->size;
 		if ((ret = __db_poff(dbp, data, &dbo.pgno, __bam_new)) != 0)
 			goto err;
@@ -472,7 +470,7 @@ __bam_iitem(dbp, hp, indxp, key, data, op, flags)
 		if (op == DB_CURRENT) {
 			bk = GET_BKEYDATA(h,
 			    indx + (TYPE(h) == P_LBTREE ? O_INDX : 0));
-			if (bk->type == B_OVERFLOW)
+			if (B_TYPE(bk->type) == B_OVERFLOW)
 				have_bytes = BOVERFLOW_PSIZE;
 			else
 				have_bytes = BKEYDATA_PSIZE(bk->len);
@@ -492,7 +490,7 @@ __bam_iitem(dbp, hp, indxp, key, data, op, flags)
 		 * alignment) and do a delete/insert otherwise.
 		 */
 		if (op == DB_CURRENT && !bigdata &&
-		    bk->type == B_KEYDATA && have_bytes == need_bytes)
+		    B_TYPE(bk->type) == B_KEYDATA && have_bytes == need_bytes)
 			dcopy = 1;
 		if (have_bytes < need_bytes)
 			needed += need_bytes - have_bytes;
@@ -622,9 +620,8 @@ __bam_iitem(dbp, hp, indxp, key, data, op, flags)
 		__data.size = data->size;
 
 		if (LF_ISSET(BI_DELETED)) {
+			B_TSET(__bk.type, B_KEYDATA, 1);
 			__bk.len = __data.size;
-			__bk.deleted = 1;
-			__bk.type = B_KEYDATA;
 			__hdr.data = &__bk;
 			__hdr.size = SSZA(BKEYDATA, data);
 			ret = __db_pitem(dbp, h, indx,
@@ -687,10 +684,10 @@ __bam_ndup(dbp, h, indx)
 		if (indx >= NUM_ENT(h) || h->inp[first] != h->inp[indx])
 			break;
 		bk = GET_BKEYDATA(h, indx);
-		sz += bk->type == B_KEYDATA ?
+		sz += B_TYPE(bk->type) == B_KEYDATA ?
 		    BKEYDATA_PSIZE(bk->len) : BOVERFLOW_PSIZE;
 		bk = GET_BKEYDATA(h, indx + O_INDX);
-		sz += bk->type == B_KEYDATA ?
+		sz += B_TYPE(bk->type) == B_KEYDATA ?
 		    BKEYDATA_PSIZE(bk->len) : BOVERFLOW_PSIZE;
 	}
 
@@ -716,7 +713,7 @@ __bam_ndup(dbp, h, indx)
 		/* Copy the entry to the new page. */
 		bk = GET_BKEYDATA(h, indx);
 		hdr.data = bk;
-		hdr.size = bk->type == B_KEYDATA ?
+		hdr.size = B_TYPE(bk->type) == B_KEYDATA ?
 		    BKEYDATA_SIZE(bk->len) : BOVERFLOW_SIZE;
 		if ((ret =
 		    __db_pitem(dbp, cp, cpindx, hdr.size, &hdr, NULL)) != 0)
@@ -743,8 +740,7 @@ __bam_ndup(dbp, h, indx)
 	}
 
 	/* Put in a new data item that points to the duplicates page. */
-	bo.deleted = 0;
-	bo.type = B_DUPLICATE;
+	B_TSET(bo.type, B_DUPLICATE, 0);
 	bo.pgno = cp->pgno;
 	bo.tlen = 0;
 
@@ -828,14 +824,14 @@ __bam_partial(dbp, dbt, h, indx)
 	 */
 	if (indx < NUM_ENT(h)) {
 		bk = GET_BKEYDATA(h, indx + (TYPE(h) == P_LBTREE ? O_INDX : 0));
-		if (bk->type == B_OVERFLOW) {
+		if (B_TYPE(bk->type) == B_OVERFLOW) {
 			bo = (BOVERFLOW *)bk;
 			nbytes = bo->tlen;
 		} else
 			nbytes = bk->len;
 	} else {
 		bk = &tbk;
-		bk->type = B_KEYDATA;
+		B_TSET(bk->type, B_KEYDATA, 0);
 		nbytes = bk->len = 0;
 	}
 	nbytes += dbt->doff + dbt->size + dbt->dlen;
@@ -856,7 +852,7 @@ __bam_partial(dbp, dbt, h, indx)
 	memset(t->bt_rdata.data, 0, nbytes);
 
 	tlen = 0;
-	if (bk->type == B_OVERFLOW) {
+	if (B_TYPE(bk->type) == B_OVERFLOW) {
 		/* Take up to doff bytes from the record. */
 		memset(&copy, 0, sizeof(copy));
 		if ((ret = __db_goff(dbp, &copy, bo->tlen,