BSD 4_4_Lite1 release

[unix-history] / usr / src / lib / libc / db / recno / rec_delete.c

diff --git a/usr/src/lib/libc/db/recno/rec_delete.c b/usr/src/lib/libc/db/recno/rec_delete.c
index 98d1353..35f56b9 100644 (file)
--- a/usr/src/lib/libc/db/recno/rec_delete.c
+++ b/usr/src/lib/libc/db/recno/rec_delete.c
@@ -35,7 +35,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)

-static char sccsid[] = "@(#)rec_delete.c       8.1 (Berkeley) 6/4/93";
+static char sccsid[] = "@(#)rec_delete.c       8.4 (Berkeley) 2/21/94";

 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>


@@ -71,6 +71,13 @@ __rec_delete(dbp, key, flags)
        int status;
 
        t = dbp->internal;
        int status;
 
        t = dbp->internal;

+
+       /* Toss any page pinned across calls. */
+       if (t->bt_pinned != NULL) {
+               mpool_put(t->bt_mp, t->bt_pinned, 0);
+               t->bt_pinned = NULL;
+       }
+

        switch(flags) {
        case 0:
                if ((nrec = *(recno_t *)key->data) == 0)
        switch(flags) {
        case 0:
                if ((nrec = *(recno_t *)key->data) == 0)


@@ -119,10 +126,8 @@ rec_rdelete(t, nrec)
        int status;
 
        /* Find the record; __rec_search pins the page. */
        int status;
 
        /* Find the record; __rec_search pins the page. */

-       if ((e = __rec_search(t, nrec, SDELETE)) == NULL) {
-               mpool_put(t->bt_mp, e->page, 0);
+       if ((e = __rec_search(t, nrec, SDELETE)) == NULL)

                return (RET_ERROR);
                return (RET_ERROR);

-       }

 
        /* Delete the record. */
        h = e->page;
 
        /* Delete the record. */
        h = e->page;


@@ -149,12 +154,11 @@ int
 __rec_dleaf(t, h, index)
        BTREE *t;
        PAGE *h;
 __rec_dleaf(t, h, index)
        BTREE *t;
        PAGE *h;

-       int index;
+       indx_t index;

 {
        register RLEAF *rl;
 {
        register RLEAF *rl;

-       register indx_t *ip, offset;
+       register indx_t *ip, cnt, offset;

        register size_t nbytes;
        register size_t nbytes;

-       register int cnt;

        char *from;
        void *to;
 
        char *from;
        void *to;