From 390a4882ffd0e4092641ffdd6c0e017e41793d0c Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Fri, 25 Sep 1998 21:55:47 +0000 Subject: Update. 1998-09-25 Ulrich Drepper * math/Makefile (gmp-objs): Add mp_clz_tab. 1998-09-25 David S. Miller * sysdeps/sparc/fpu/feholdexcpt.c (feholdexcept): Clear bits don't set them. * stdlib/longlong.h (sparc udiv_qrnnd): Define inline version for cpus lacking hardware multiply and divide. 1998-09-24 Andreas Schwab * db/Makefile ($(inst_slibdir)/libdb.so$(libdb1.so-version)): Use $( * db/btree/bt_delete.c: Fix -Wparentheses warning. 1998-09-24 Andreas Schwab * Makefile ($(inst_includedir)/gnu/lib-names.h): Use $(do-install). * time/strftime.c (f_wkday): Remove duplicate definition. * time/strftime.c (my_strftime): Don't store past the end of a --- db/Makefile | 2 +- db/btree/bt_delete.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'db') diff --git a/db/Makefile b/db/Makefile index 039a77e961..4df6f886b9 100644 --- a/db/Makefile +++ b/db/Makefile @@ -34,7 +34,7 @@ install-others := $(inst_slibdir)/libdb.so$(libdb1.so-version) \ $(inst_slibdir)/libdb.so$(libdb1.so-version): $(inst_slibdir)/libdb1-$(version).so $(+force) rm -f $@ - $(LN_S) $(^F) $@ + $(LN_S) $(bt_mp, prevpg, 0)) == NULL) return (1); } - + ret: mpool_put(t->bt_mp, h, 0); return ((*hp = mpool_get(t->bt_mp, c->pg.pgno, 0)) == NULL); @@ -402,7 +402,7 @@ __bt_pdelete(t, h) /* Get the parent page. */ if ((pg = mpool_get(t->bt_mp, parent->pgno, 0)) == NULL) return (RET_ERROR); - + index = parent->index; bi = GETBINTERNAL(pg, index); @@ -418,7 +418,7 @@ __bt_pdelete(t, h) * root page. If it's the rootpage, turn it back into an empty * leaf page. */ - if (NEXTINDEX(pg) == 1) + if (NEXTINDEX(pg) == 1) { if (pg->pgno == P_ROOT) { pg->lower = BTDATAOFF; pg->upper = t->bt_psize; @@ -428,7 +428,7 @@ __bt_pdelete(t, h) return (RET_ERROR); continue; } - else { + } else { /* Pack remaining key items at the end of the page. */ nksize = NBINTERNAL(bi->ksize); from = (char *)pg + pg->upper; @@ -571,7 +571,7 @@ __bt_curdel(t, key, h, index) key = &c->key; } /* Check previous key, if not at the beginning of the page. */ - if (index > 0) { + if (index > 0) { e.page = h; e.index = index - 1; if (__bt_cmp(t, key, &e) == 0) { -- cgit v1.2.3