Libc-763.11.tar.gz

[apple/libc.git] / db / btree / bt_seq-fbsd.c

diff --git a/db/btree/bt_seq-fbsd.c b/db/btree/bt_seq-fbsd.c
index 5cac84bc7e51a9e6e24bf462fa50764e4bcf936f..b0b8b04ede2f973a9e7e725404f2819f6d66af0c 100644 (file)
--- a/db/btree/bt_seq-fbsd.c
+++ b/db/btree/bt_seq-fbsd.c
@@ -13,10 +13,6 @@
  * 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.
@@ -38,7 +34,7 @@
 static char sccsid[] = "@(#)bt_seq.c   8.7 (Berkeley) 7/20/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/db/btree/bt_seq.c,v 1.3 2002/03/21 22:46:25 obrien Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/db/btree/bt_seq.c,v 1.7 2009/03/04 00:58:04 delphij Exp $");
 
 #include <sys/types.h>
 
@@ -76,10 +72,7 @@ static int __bt_seqset(BTREE *, EPG *, DBT *, int);
  *     RET_ERROR, RET_SUCCESS or RET_SPECIAL if there's no next key.
  */
 int
-__bt_seq(dbp, key, data, flags)
-       const DB *dbp;
-       DBT *key, *data;
-       u_int flags;
+__bt_seq(const DB *dbp, DBT *key, DBT *data, u_int flags)
 {
        BTREE *t;
        EPG e;
@@ -151,11 +144,7 @@ __bt_seq(dbp, key, data, flags)
  *     RET_ERROR, RET_SUCCESS or RET_SPECIAL if there's no next key.
  */
 static int
-__bt_seqset(t, ep, key, flags)
-       BTREE *t;
-       EPG *ep;
-       DBT *key;
-       int flags;
+__bt_seqset(BTREE *t, EPG *ep, DBT *key, int flags)
 {
        PAGE *h;
        pgno_t pg;
@@ -239,14 +228,11 @@ __bt_seqset(t, ep, key, flags)
  *     RET_ERROR, RET_SUCCESS or RET_SPECIAL if there's no next key.
  */
 static int
-__bt_seqadv(t, ep, flags)
-       BTREE *t;
-       EPG *ep;
-       int flags;
+__bt_seqadv(BTREE *t, EPG *ep, int flags)
 {
        CURSOR *c;
        PAGE *h;
-       indx_t index;
+       indx_t idx;
        pgno_t pg;
        int exact;
 
@@ -272,7 +258,7 @@ __bt_seqadv(t, ep, flags)
                return (RET_ERROR);
 
        /*
-        * Find the next/previous record in the tree and point the cursor at
+        * Find the next/previous record in the tree and point the cursor at
         * it.  The cursor may not be moved until a new key has been found.
         */
        switch (flags) {
@@ -284,15 +270,15 @@ __bt_seqadv(t, ep, flags)
                 */
                if (F_ISSET(c, CURS_AFTER))
                        goto usecurrent;
-               index = c->pg.index;
-               if (++index == NEXTINDEX(h)) {
+               idx = c->pg.index;
+               if (++idx == NEXTINDEX(h)) {
                        pg = h->nextpg;
                        mpool_put(t->bt_mp, h, 0);
                        if (pg == P_INVALID)
                                return (RET_SPECIAL);
                        if ((h = mpool_get(t->bt_mp, pg, 0)) == NULL)
                                return (RET_ERROR);
-                       index = 0;
+                       idx = 0;
                }
                break;
        case R_PREV:                    /* Previous record. */
@@ -307,22 +293,22 @@ usecurrent:               F_CLR(c, CURS_AFTER | CURS_BEFORE);
                        ep->index = c->pg.index;
                        return (RET_SUCCESS);
                }
-               index = c->pg.index;
-               if (index == 0) {
+               idx = c->pg.index;
+               if (idx == 0) {
                        pg = h->prevpg;
                        mpool_put(t->bt_mp, h, 0);
                        if (pg == P_INVALID)
                                return (RET_SPECIAL);
                        if ((h = mpool_get(t->bt_mp, pg, 0)) == NULL)
                                return (RET_ERROR);
-                       index = NEXTINDEX(h) - 1;
+                       idx = NEXTINDEX(h) - 1;
                } else
-                       --index;
+                       --idx;
                break;
        }
 
        ep->page = h;
-       ep->index = index;
+       ep->index = idx;
        return (RET_SUCCESS);
 }
 
@@ -341,11 +327,7 @@ usecurrent:                F_CLR(c, CURS_AFTER | CURS_BEFORE);
  *     or RET_SPECIAL if no such key exists.
  */
 static int
-__bt_first(t, key, erval, exactp)
-       BTREE *t;
-       const DBT *key;
-       EPG *erval;
-       int *exactp;
+__bt_first(BTREE *t, const DBT *key, EPG *erval, int *exactp)
 {
        PAGE *h;
        EPG *ep, save;
@@ -366,7 +348,7 @@ __bt_first(t, key, erval, exactp)
                        *erval = *ep;
                        return (RET_SUCCESS);
                }
-                       
+
                /*
                 * Walk backwards, as long as the entry matches and there are
                 * keys left in the tree.  Save a copy of each match in case
@@ -440,13 +422,10 @@ __bt_first(t, key, erval, exactp)
  * Parameters:
  *     t:      the tree
  *   pgno:     page number
- *  index:     page index
+ *    idx:     page index
  */
 void
-__bt_setcur(t, pgno, index)
-       BTREE *t;
-       pgno_t pgno;
-       u_int index;
+__bt_setcur(BTREE *t, pgno_t pgno, u_int idx)
 {
        /* Lose any already deleted key. */
        if (t->bt_cursor.key.data != NULL) {
@@ -458,6 +437,6 @@ __bt_setcur(t, pgno, index)
 
        /* Update the cursor. */
        t->bt_cursor.pg.pgno = pgno;
-       t->bt_cursor.pg.index = index;
+       t->bt_cursor.pg.index = idx;
        F_SET(&t->bt_cursor, CURS_INIT);
 }