mirror of
https://sourceware.org/git/glibc.git
synced 2025-07-29 11:41:21 +03:00
Update.
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.
This commit is contained in:
Ulrich Drepper
@ -44,7 +44,7 @@
|
||||
#include "config.h"
|
||||
|
||||
#ifndef lint
|
||||
static const char sccsid[] = "@(#)bt_split.c 10.12 (Sleepycat) 8/24/97";
|
||||
static const char sccsid[] = "@(#)bt_split.c 10.14 (Sleepycat) 9/3/97";
|
||||
#endif /* not lint */
|
||||
|
||||
#ifndef NO_SYSTEM_INCLUDES
|
||||
@ -394,8 +394,7 @@ __bam_broot(dbp, rootp, lp, rp)
|
||||
* level of the tree is never used, so it doesn't need to be filled in.
|
||||
*/
|
||||
bi.len = 0;
|
||||
bi.deleted = 0;
|
||||
bi.type = B_KEYDATA;
|
||||
B_TSET(bi.type, B_KEYDATA, 0);
|
||||
bi.pgno = lp->pgno;
|
||||
if (F_ISSET(dbp, DB_BT_RECNUM)) {
|
||||
bi.nrecs = __bam_total(lp);
|
||||
@ -405,7 +404,7 @@ __bam_broot(dbp, rootp, lp, rp)
|
||||
hdr.data = &bi;
|
||||
hdr.size = SSZA(BINTERNAL, data);
|
||||
memset(&data, 0, sizeof(data));
|
||||
data.data = (char *) "";
|
||||
data.data = (char *)"";
|
||||
data.size = 0;
|
||||
if ((ret =
|
||||
__db_pitem(dbp, rootp, 0, BINTERNAL_SIZE(0), &hdr, &data)) != 0)
|
||||
@ -417,8 +416,7 @@ __bam_broot(dbp, rootp, lp, rp)
|
||||
child_bi = GET_BINTERNAL(rp, 0);
|
||||
|
||||
bi.len = child_bi->len;
|
||||
bi.deleted = 0;
|
||||
bi.type = child_bi->type;
|
||||
B_TSET(bi.type, child_bi->type, 0);
|
||||
bi.pgno = rp->pgno;
|
||||
if (F_ISSET(dbp, DB_BT_RECNUM)) {
|
||||
bi.nrecs = __bam_total(rp);
|
||||
@ -433,18 +431,17 @@ __bam_broot(dbp, rootp, lp, rp)
|
||||
return (ret);
|
||||
|
||||
/* Increment the overflow ref count. */
|
||||
if (child_bi->type == B_OVERFLOW && (ret =
|
||||
if (B_TYPE(child_bi->type) == B_OVERFLOW && (ret =
|
||||
__db_ioff(dbp, ((BOVERFLOW *)(child_bi->data))->pgno)) != 0)
|
||||
return (ret);
|
||||
break;
|
||||
case P_LBTREE:
|
||||
/* Copy the first key of the child page onto the root page. */
|
||||
child_bk = GET_BKEYDATA(rp, 0);
|
||||
switch (child_bk->type) {
|
||||
switch (B_TYPE(child_bk->type)) {
|
||||
case B_KEYDATA:
|
||||
bi.len = child_bk->len;
|
||||
bi.deleted = 0;
|
||||
bi.type = child_bk->type;
|
||||
B_TSET(bi.type, child_bk->type, 0);
|
||||
bi.pgno = rp->pgno;
|
||||
if (F_ISSET(dbp, DB_BT_RECNUM)) {
|
||||
bi.nrecs = __bam_total(rp);
|
||||
@ -461,8 +458,7 @@ __bam_broot(dbp, rootp, lp, rp)
|
||||
case B_DUPLICATE:
|
||||
case B_OVERFLOW:
|
||||
bi.len = BOVERFLOW_SIZE;
|
||||
bi.deleted = 0;
|
||||
bi.type = child_bk->type;
|
||||
B_TSET(bi.type, child_bk->type, 0);
|
||||
bi.pgno = rp->pgno;
|
||||
if (F_ISSET(dbp, DB_BT_RECNUM)) {
|
||||
bi.nrecs = __bam_total(rp);
|
||||
@ -477,7 +473,7 @@ __bam_broot(dbp, rootp, lp, rp)
|
||||
return (ret);
|
||||
|
||||
/* Increment the overflow ref count. */
|
||||
if (child_bk->type == B_OVERFLOW && (ret =
|
||||
if (B_TYPE(child_bk->type) == B_OVERFLOW && (ret =
|
||||
__db_ioff(dbp, ((BOVERFLOW *)child_bk)->pgno)) != 0)
|
||||
return (ret);
|
||||
break;
|
||||
@ -594,8 +590,7 @@ __bam_pinsert(dbp, parent, lchild, rchild)
|
||||
|
||||
/* Add a new record for the right page. */
|
||||
bi.len = child_bi->len;
|
||||
bi.deleted = 0;
|
||||
bi.type = child_bi->type;
|
||||
B_TSET(bi.type, child_bi->type, 0);
|
||||
bi.pgno = rchild->pgno;
|
||||
bi.nrecs = nrecs;
|
||||
memset(&hdr, 0, sizeof(hdr));
|
||||
@ -609,13 +604,13 @@ __bam_pinsert(dbp, parent, lchild, rchild)
|
||||
return (ret);
|
||||
|
||||
/* Increment the overflow ref count. */
|
||||
if (child_bi->type == B_OVERFLOW && (ret =
|
||||
if (B_TYPE(child_bi->type) == B_OVERFLOW && (ret =
|
||||
__db_ioff(dbp, ((BOVERFLOW *)(child_bi->data))->pgno)) != 0)
|
||||
return (ret);
|
||||
break;
|
||||
case P_LBTREE:
|
||||
child_bk = GET_BKEYDATA(rchild, 0);
|
||||
switch (child_bk->type) {
|
||||
switch (B_TYPE(child_bk->type)) {
|
||||
case B_KEYDATA:
|
||||
nbytes = BINTERNAL_PSIZE(child_bk->len);
|
||||
nksize = child_bk->len;
|
||||
@ -624,7 +619,7 @@ __bam_pinsert(dbp, parent, lchild, rchild)
|
||||
if (ppage->prev_pgno == PGNO_INVALID && off <= 1)
|
||||
goto noprefix;
|
||||
tmp_bk = GET_BKEYDATA(lchild, NUM_ENT(lchild) - P_INDX);
|
||||
if (tmp_bk->type != B_KEYDATA)
|
||||
if (B_TYPE(tmp_bk->type) != B_KEYDATA)
|
||||
goto noprefix;
|
||||
memset(&a, 0, sizeof(a));
|
||||
a.size = tmp_bk->len;
|
||||
@ -643,8 +638,7 @@ noprefix: nksize = child_bk->len;
|
||||
return (DB_NEEDSPLIT);
|
||||
|
||||
bi.len = nksize;
|
||||
bi.deleted = 0;
|
||||
bi.type = child_bk->type;
|
||||
B_TSET(bi.type, child_bk->type, 0);
|
||||
bi.pgno = rchild->pgno;
|
||||
bi.nrecs = nrecs;
|
||||
memset(&hdr, 0, sizeof(hdr));
|
||||
@ -665,8 +659,7 @@ noprefix: nksize = child_bk->len;
|
||||
return (DB_NEEDSPLIT);
|
||||
|
||||
bi.len = BOVERFLOW_SIZE;
|
||||
bi.deleted = 0;
|
||||
bi.type = child_bk->type;
|
||||
B_TSET(bi.type, child_bk->type, 0);
|
||||
bi.pgno = rchild->pgno;
|
||||
bi.nrecs = nrecs;
|
||||
memset(&hdr, 0, sizeof(hdr));
|
||||
@ -680,7 +673,7 @@ noprefix: nksize = child_bk->len;
|
||||
return (ret);
|
||||
|
||||
/* Increment the overflow ref count. */
|
||||
if (child_bk->type == B_OVERFLOW && (ret =
|
||||
if (B_TYPE(child_bk->type) == B_OVERFLOW && (ret =
|
||||
__db_ioff(dbp, ((BOVERFLOW *)child_bk)->pgno)) != 0)
|
||||
return (ret);
|
||||
break;
|
||||
@ -796,21 +789,21 @@ __bam_psplit(dbp, cp, lp, rp, cleft)
|
||||
for (nbytes = 0, off = 0; off < top && nbytes < half; ++off)
|
||||
switch (TYPE(pp)) {
|
||||
case P_IBTREE:
|
||||
if (GET_BINTERNAL(pp, off)->type == B_KEYDATA)
|
||||
if (B_TYPE(GET_BINTERNAL(pp, off)->type) == B_KEYDATA)
|
||||
nbytes +=
|
||||
BINTERNAL_SIZE(GET_BINTERNAL(pp, off)->len);
|
||||
else
|
||||
nbytes += BINTERNAL_SIZE(BOVERFLOW_SIZE);
|
||||
break;
|
||||
case P_LBTREE:
|
||||
if (GET_BKEYDATA(pp, off)->type == B_KEYDATA)
|
||||
if (B_TYPE(GET_BKEYDATA(pp, off)->type) == B_KEYDATA)
|
||||
nbytes +=
|
||||
BKEYDATA_SIZE(GET_BKEYDATA(pp, off)->len);
|
||||
else
|
||||
nbytes += BOVERFLOW_SIZE;
|
||||
|
||||
++off;
|
||||
if (GET_BKEYDATA(pp, off)->type == B_KEYDATA)
|
||||
if (B_TYPE(GET_BKEYDATA(pp, off)->type) == B_KEYDATA)
|
||||
nbytes +=
|
||||
BKEYDATA_SIZE(GET_BKEYDATA(pp, off)->len);
|
||||
else
|
||||
@ -832,9 +825,9 @@ sort: splitp = off;
|
||||
* it's a big key, try and find something close by that's not.
|
||||
*/
|
||||
if (TYPE(pp) == P_IBTREE)
|
||||
isbigkey = GET_BINTERNAL(pp, off)->type != B_KEYDATA;
|
||||
isbigkey = B_TYPE(GET_BINTERNAL(pp, off)->type) != B_KEYDATA;
|
||||
else if (TYPE(pp) == P_LBTREE)
|
||||
isbigkey = GET_BKEYDATA(pp, off)->type != B_KEYDATA;
|
||||
isbigkey = B_TYPE(GET_BKEYDATA(pp, off)->type) != B_KEYDATA;
|
||||
else
|
||||
isbigkey = 0;
|
||||
if (isbigkey)
|
||||
@ -842,8 +835,8 @@ sort: splitp = off;
|
||||
off = splitp + cnt * adjust;
|
||||
if (off < (db_indx_t)NUM_ENT(pp) &&
|
||||
((TYPE(pp) == P_IBTREE &&
|
||||
GET_BINTERNAL(pp, off)->type == B_KEYDATA) ||
|
||||
GET_BKEYDATA(pp, off)->type == B_KEYDATA)) {
|
||||
B_TYPE(GET_BINTERNAL(pp,off)->type) == B_KEYDATA) ||
|
||||
B_TYPE(GET_BKEYDATA(pp, off)->type) == B_KEYDATA)) {
|
||||
splitp = off;
|
||||
break;
|
||||
}
|
||||
@ -851,8 +844,8 @@ sort: splitp = off;
|
||||
continue;
|
||||
off = splitp - cnt * adjust;
|
||||
if (TYPE(pp) == P_IBTREE ?
|
||||
GET_BINTERNAL(pp, off)->type == B_KEYDATA :
|
||||
GET_BKEYDATA(pp, off)->type == B_KEYDATA) {
|
||||
B_TYPE(GET_BINTERNAL(pp, off)->type) == B_KEYDATA :
|
||||
B_TYPE(GET_BKEYDATA(pp, off)->type) == B_KEYDATA) {
|
||||
splitp = off;
|
||||
break;
|
||||
}
|
||||
@ -915,7 +908,7 @@ __bam_copy(dbp, pp, cp, nxt, stop)
|
||||
for (dup = off = 0; nxt < stop; ++nxt, ++NUM_ENT(cp), ++off) {
|
||||
switch (TYPE(pp)) {
|
||||
case P_IBTREE:
|
||||
if (GET_BINTERNAL(pp, nxt)->type == B_KEYDATA)
|
||||
if (B_TYPE(GET_BINTERNAL(pp, nxt)->type) == B_KEYDATA)
|
||||
nbytes =
|
||||
BINTERNAL_SIZE(GET_BINTERNAL(pp, nxt)->len);
|
||||
else
|
||||
@ -933,7 +926,7 @@ __bam_copy(dbp, pp, cp, nxt, stop)
|
||||
}
|
||||
/* FALLTHROUGH */
|
||||
case P_LRECNO:
|
||||
if (GET_BKEYDATA(pp, nxt)->type == B_KEYDATA)
|
||||
if (B_TYPE(GET_BKEYDATA(pp, nxt)->type) == B_KEYDATA)
|
||||
nbytes =
|
||||
BKEYDATA_SIZE(GET_BKEYDATA(pp, nxt)->len);
|
||||
else
|
||||
|
||||
Reference in New Issue
Block a user