Libc-320.tar.gz

[apple/libc.git] / db / recno / rec_search.c

diff --git a/db/recno/rec_search.c b/db/recno/rec_search.c
index 9cf4341070a1d1f73bf0d0249932a303be639368..b9d6f6ca3def2463af843e17229230b14f079c35 100644 (file)
--- a/db/recno/rec_search.c
+++ b/db/recno/rec_search.c
@@ -1,25 +1,28 @@
 /*
 /*

- * Copyright (c) 1999 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2003 Apple Computer, Inc. All rights reserved.

  *
  * @APPLE_LICENSE_HEADER_START@
  * 
  *
  * @APPLE_LICENSE_HEADER_START@
  * 

- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
+ * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.

  * 
  * 

- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER

  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,

- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.

  * 
  * @APPLE_LICENSE_HEADER_END@
  */
  * 
  * @APPLE_LICENSE_HEADER_END@
  */

-/*
+/*-

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


@@ -52,6 +55,10 @@
  * SUCH DAMAGE.
  */
 
  * SUCH DAMAGE.
  */
 

+#if defined(LIBC_SCCS) && !defined(lint)
+static char sccsid[] = "@(#)rec_search.c       8.4 (Berkeley) 7/14/94";
+#endif /* LIBC_SCCS and not lint */
+#include <sys/cdefs.h>

 
 #include <sys/types.h>
 
 
 #include <sys/types.h>
 


@@ -84,8 +91,8 @@ __rec_search(t, recno, op)
        recno_t recno;
        enum SRCHOP op;
 {
        recno_t recno;
        enum SRCHOP op;
 {

-       register indx_t index;
-       register PAGE *h;
+       indx_t index;
+       PAGE *h;

        EPGNO *parent;
        RINTERNAL *r;
        pgno_t pg;
        EPGNO *parent;
        RINTERNAL *r;
        pgno_t pg;


@@ -109,8 +116,7 @@ __rec_search(t, recno, op)
                        total += r->nrecs;
                }
 
                        total += r->nrecs;
                }
 

-               if (__bt_push(t, pg, index - 1) == RET_ERROR)
-                       return (NULL);
+               BT_PUSH(t, pg, index - 1);

                
                pg = r->pgno;
                switch (op) {
                
                pg = r->pgno;
                switch (op) {