BSD 4_4 release

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

diff --git a/usr/src/lib/libc/db/recno/rec_seq.c b/usr/src/lib/libc/db/recno/rec_seq.c
index 33c583c..29210a7 100644 (file)
--- a/usr/src/lib/libc/db/recno/rec_seq.c
+++ b/usr/src/lib/libc/db/recno/rec_seq.c
@@ -1,12 +1,38 @@
 /*-
 /*-

- * Copyright (c) 1991 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1991, 1993
+ *     The Regents of the University of California.  All rights reserved.

  *
  *

- * %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.

  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)rec_seq.c  5.7 (Berkeley) %G%";
+static char sccsid[] = "@(#)rec_seq.c  8.1 (Berkeley) 6/4/93";

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


@@ -49,7 +75,7 @@ __rec_seq(dbp, key, data, flags)
                        goto einval;
                break;
        case R_NEXT:
                        goto einval;
                break;
        case R_NEXT:

-               if (ISSET(t, BTF_SEQINIT)) {
+               if (ISSET(t, B_SEQINIT)) {

                        nrec = t->bt_rcursor + 1;
                        break;
                }
                        nrec = t->bt_rcursor + 1;
                        break;
                }


@@ -58,14 +84,14 @@ __rec_seq(dbp, key, data, flags)
                nrec = 1;
                break;
        case R_PREV:
                nrec = 1;
                break;
        case R_PREV:

-               if (ISSET(t, BTF_SEQINIT)) {
+               if (ISSET(t, B_SEQINIT)) {

                        if ((nrec = t->bt_rcursor - 1) == 0)
                                return (RET_SPECIAL);
                        break;
                }
                /* FALLTHROUGH */
        case R_LAST:
                        if ((nrec = t->bt_rcursor - 1) == 0)
                                return (RET_SPECIAL);
                        break;
                }
                /* FALLTHROUGH */
        case R_LAST:

-               if (!ISSET(t, BTF_RINMEM) &&
+               if (!ISSET(t, R_EOF | R_INMEM) &&

                    t->bt_irec(t, MAX_REC_NUMBER) == RET_ERROR)
                        return (RET_ERROR);
                nrec = t->bt_nrecs;
                    t->bt_irec(t, MAX_REC_NUMBER) == RET_ERROR)
                        return (RET_ERROR);
                nrec = t->bt_nrecs;


@@ -76,7 +102,7 @@ einval:              errno = EINVAL;
        }
        
        if (t->bt_nrecs == 0 || nrec > t->bt_nrecs) {
        }
        
        if (t->bt_nrecs == 0 || nrec > t->bt_nrecs) {

-               if (!ISSET(t, BTF_RINMEM) &&
+               if (!ISSET(t, R_EOF | R_INMEM) &&

                    (status = t->bt_irec(t, nrec)) != RET_SUCCESS)
                        return (status);
                if (t->bt_nrecs == 0 || nrec > t->bt_nrecs)
                    (status = t->bt_irec(t, nrec)) != RET_SUCCESS)
                        return (status);
                if (t->bt_nrecs == 0 || nrec > t->bt_nrecs)


@@ -86,7 +112,7 @@ einval:              errno = EINVAL;
        if ((e = __rec_search(t, nrec - 1, SEARCH)) == NULL)
                return (RET_ERROR);
 
        if ((e = __rec_search(t, nrec - 1, SEARCH)) == NULL)
                return (RET_ERROR);
 

-       SET(t, BTF_SEQINIT);
+       SET(t, B_SEQINIT);

        t->bt_rcursor = nrec;
 
        status = __rec_ret(t, e, nrec, key, data);
        t->bt_rcursor = nrec;
 
        status = __rec_ret(t, e, nrec, key, data);