diff options
Diffstat (limited to 'db')
| -rw-r--r-- | db/Makefile | 2 | ||||
| -rw-r--r-- | db/btree/bt_delete.c | 12 |
2 files changed, 7 insertions, 7 deletions
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) $(<F) $@ $(db1-headers:%=$(inst_includedir)/db1/%): $(inst_includedir)/db1/%: % $(+force) $(do-install) diff --git a/db/btree/bt_delete.c b/db/btree/bt_delete.c index ece1ab656e..b654c9f1f8 100644 --- a/db/btree/bt_delete.c +++ b/db/btree/bt_delete.c @@ -154,7 +154,7 @@ __bt_stkacq(t, hp, c) pgno_t pgno; recno_t nextpg, prevpg; int exact, level; - + /* * Find the first occurrence of the key in the tree. Toss the * currently locked page so we don't hit an already-locked page. @@ -270,7 +270,7 @@ __bt_stkacq(t, hp, c) if ((h = mpool_get(t->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) { |