BSD 4_4_Lite1 release

[unix-history] / usr / src / lib / libc / db / btree / bt_put.c

diff --git a/usr/src/lib/libc/db/btree/bt_put.c b/usr/src/lib/libc/db/btree/bt_put.c
index 817f9a2..11a211b 100644 (file)
--- a/usr/src/lib/libc/db/btree/bt_put.c
+++ b/usr/src/lib/libc/db/btree/bt_put.c
@@ -5,11 +5,37 @@
  * This code is derived from software contributed to Berkeley by
  * Mike Olson.
  *
  * This code is derived from software contributed to Berkeley by
  * Mike Olson.
  *

- * %sccs.include.redist.c%
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.

  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)

-static char sccsid[] = "@(#)bt_put.c   8.2 (Berkeley) %G%";
+static char sccsid[] = "@(#)bt_put.c   8.3 (Berkeley) 9/16/93";

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


@@ -240,7 +266,6 @@ bt_fast(t, key, data, exactp)
        const DBT *key, *data;
        int *exactp;
 {
        const DBT *key, *data;
        int *exactp;
 {

-       EPG e;

        PAGE *h;
        size_t nbytes;
        int cmp;
        PAGE *h;
        size_t nbytes;
        int cmp;


@@ -249,8 +274,8 @@ bt_fast(t, key, data, exactp)
                t->bt_order = NOT;
                return (NULL);
        }
                t->bt_order = NOT;
                return (NULL);
        }

-       e.page = h;
-       e.index = t->bt_last.index;
+       t->bt_cur.page = h;
+       t->bt_cur.index = t->bt_last.index;

 
        /*
         * If won't fit in this page or have too many keys in this page, have
 
        /*
         * If won't fit in this page or have too many keys in this page, have


@@ -261,19 +286,19 @@ bt_fast(t, key, data, exactp)
                goto miss;
 
        if (t->bt_order == FORWARD) {
                goto miss;
 
        if (t->bt_order == FORWARD) {

-               if (e.page->nextpg != P_INVALID)
+               if (t->bt_cur.page->nextpg != P_INVALID)

                        goto miss;
                        goto miss;

-               if (e.index != NEXTINDEX(h) - 1)
+               if (t->bt_cur.index != NEXTINDEX(h) - 1)

                        goto miss;
                        goto miss;

-               if ((cmp = __bt_cmp(t, key, &e)) < 0)
+               if ((cmp = __bt_cmp(t, key, &t->bt_cur)) < 0)

                        goto miss;
                        goto miss;

-               t->bt_last.index = cmp ? ++e.index : e.index;
+               t->bt_last.index = cmp ? ++t->bt_cur.index : t->bt_cur.index;

        } else {
        } else {

-               if (e.page->prevpg != P_INVALID)
+               if (t->bt_cur.page->prevpg != P_INVALID)

                        goto miss;
                        goto miss;

-               if (e.index != 0)
+               if (t->bt_cur.index != 0)

                        goto miss;
                        goto miss;

-               if ((cmp = __bt_cmp(t, key, &e)) > 0)
+               if ((cmp = __bt_cmp(t, key, &t->bt_cur)) > 0)

                        goto miss;
                t->bt_last.index = 0;
        }
                        goto miss;
                t->bt_last.index = 0;
        }


@@ -281,7 +306,7 @@ bt_fast(t, key, data, exactp)
 #ifdef STATISTICS
        ++bt_cache_hit;
 #endif
 #ifdef STATISTICS
        ++bt_cache_hit;
 #endif

-       return (&e);
+       return (&t->bt_cur);

 
 miss:
 #ifdef STATISTICS
 
 miss:
 #ifdef STATISTICS